Changeset 1402 for trunk/dll/inis.c


Ignore:
Timestamp:
Mar 14, 2009, 6:17:59 PM (16 years ago)
Author:
Gregg Young
Message:

Remove variable aurgs from docopy & unlinkf (not used); Move more strings to PCSZs and string table; Move PCSZs to compile time initialization; Fix hang on startup caused by a drive scan and a dircnr scan trying to update a drive in the tree at the same time (related to the "treeswitch options); Code cleanup mainly removal of old printfs, SayMsgs, DbgMsg and unneeded %s.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/dll/inis.c

    r1400 r1402  
    3333  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
    3434  08 Mar 09 GKY Additional strings move to PCSZs in init.c
     35  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
     36  14 Mar 09 GKY Additional strings move to PCSZs
    3537
    3638***********************************************************************/
    … …  
    8688
    8789#pragma data_seg(GLOBAL2)
    88 CHAR *DRF_FM2INI;
    89 CHAR *DRM_FM2INIRECORD;
     90PCSZ DRF_FM2INI  = "DRF_FM2INI";
     91PCSZ DRM_FM2INIRECORD  = "DRM_FM2INIRECORD";
    9092RGB2 RGBBLACK;
    9193
    … …  
    197199          if (hiniFrom == NULLHANDLE) {
    198200            Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
    199                       "PrfOpenProfile failed for %s", inirec->filename1);
     201                      PCSZ_PRFOPENPROFILEFAILED, inirec->filename1);
    200202          }
    201203        }
    … …  
    207209            if (hiniTo == NULLHANDLE) {
    208210              Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
    209                         "PrfOpenProfile failed for %s", inirec->filename2);
     211                        PCSZ_PRFOPENPROFILEFAILED, inirec->filename2);
    210212            }
    211213          }
    … …  
    410412        if (orig == NULLHANDLE) {
    411413          Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
    412                     "PrfOpenProfile failed for %s", prfp->pszUserName);
     414                    PCSZ_PRFOPENPROFILEFAILED, prfp->pszUserName);
    413415        }
    414416        else {
    … …  
    416418          if (new == NULLHANDLE) {
    417419            Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
    418                       "PrfOpenProfile failed for %s", prfp->pszSysName);
     420                      PCSZ_PRFOPENPROFILEFAILED, prfp->pszSysName);
    419421          }
    420422          else {
    … …  
    16921694      if (!DrgAccessDraginfo(pDInfo)) {
    16931695        Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
    1694                   "DrgAccessDraginfo");
     1696                  PCSZ_DRGACCESSDRAGINFO);
    16951697      }
    16961698      else {
    … …  
    17311733      if (!DrgAccessDraginfo(pDInfo)) {
    17321734        Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
    1733                   "DrgAccessDraginfo");
     1735                  PCSZ_DRGACCESSDRAGINFO);
    17341736        return 0;
    17351737      }
    … …  
    20982100      if (inidata->hini == NULLHANDLE) {
    20992101        Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
    2100                   "PrfOpenProfile failed for %s", inidata->ininame);
     2102                  PCSZ_PRFOPENPROFILEFAILED, inidata->ininame);
    21012103      }
    21022104      else {
Note: See TracChangeset for help on using the changeset viewer.