Changeset 1242

Timestamp:

Oct 9, 2008, 1:21:13 PM (17 years ago)

Author:

John Small

Message:

Ticket 288: Ensure DEBUG is passed to compiler and cleanup obsolete #ifdef DEBUG code

Location:

trunk/dll

Files:

• arccnrs.c (modified) (2 diffs)
• makefile (modified) (5 diffs)
• update.c (modified) (7 diffs)

trunk/dll/arccnrs.c

@@ -519 +519 @@
 ReTry:
 
-#ifdef DEBUG
-  if (info && info->id)
-    WinSetWindowText(WinQueryWindow
-                     (WinQueryWindow(hwndCnr, QW_PARENT), QW_PARENT),
-                     info->id);
-#endif
-
   tinfo = NULL;
   numarcfiles = counter = highest = 0;
@@ -729 +722 @@
             RECORDINSERT ri;
             PARCITEM pai;
-
-#ifdef DEBUG
-            saymsg(MB_ENTER, hwndCnr, DEBUG_STRING,
-                   "fname: %s\r\rpp: %s\r\rp: %s\r\rlonename: %s\r\rhighest: %ld\r\rx: %ld\r\rfdate: %s",
-                   fname ? fname : "NULL",
-                   pp ? pp : "NULL",
-                   p ? p : "NULL",
-                   lonename, highest, x, (fdate) ? fdate : "NULL");
-#endif
 
             pai = WinSendMsg(hwndCnr,

trunk/dll/makefile

@@ -41 +41 @@
 # 26 May 08 SHL Update WARNALL to warn about more
 # 22 Jul 08 SHL Change from dllsyms to syms target for consistency
+# 06 Oct 08 SHL Add missing -dDEBUG= to CFLAGS; rework lxlite suppress logic
 
 # Environment:
@@ -124 +125 @@
 
 !ifdef DEBUG
-CFLAGS =  -bt=os2 -mf -bd -bm -hd -d2 -olirs -s -sg -j -wx -zfp -zgp -zp4 -zq
-CFLAGS =  -bt=os2 -mf -bd -bm -hd -d2        -s -sg -j -wx -zfp -zgp -zp4 -zq
+CFLAGS =  -bt=os2 -mf -bd -bm -hd -d2 -olirs -s -sg -j -wx -zfp -zgp -zp4 -zq -d$DEBUG_OPT
+CFLAGS =  -bt=os2 -mf -bd -bm -hd -d2        -s -sg -j -wx -zfp -zgp -zp4 -zq -d$DEBUG_OPT
 !else
 CFLAGS =  -bt=os2 -mf -bd -bm -hd -d1 -olirs -s -sg -j -wx -zfp -zgp -zp4 -zq
@@ -235 +236 @@
 !ifndef DEBUG
   lxlite -c:exehdr internal\mkstr.exe >nul
-!else
-! ifeq DEBUG 0
-    lxlite -c:exehdr internal\mkstr.exe >nul
 ! endif
-!endif
 
 !endif
@@ -299 +296 @@
   lxlite $@ /x+ /b-
   lxlite $@ /c:minstub
-!else
-! ifeq DEBUG 0
-    lxlite $@ /x+ /b-
-    lxlite $@ /c:minstub
-! endif
 !endif
   $(RC) $(RCFLAGS2) $(BASERES).res $@
 !ifndef DEBUG
   lxlite $@ /x- /b-
-!else
-! ifeq DEBUG 0
-    lxlite $@ /x- /b-
-! endif
 !endif
   bldlevel $@
@@ -337 +325 @@
 !ifndef DEBUG
    @for %f in ($(BASE).dll $(BASERES).dll) do !lxlite /x- /b- %f
-!else
-!  ifeq DEBUG 0
-     @for %f in ($(BASE).dll $(BASERES).dll) do !lxlite /x- /b- %f
-!  endif
 !endif
 

trunk/dll/update.c

@@ -80 +80 @@
   APIRET status;
 
-#ifdef DEBUG
-  BOOL existed = FALSE, updated = FALSE, added = FALSE, deleted =
-    FALSE, found = FALSE;
-#endif
-
   if (!filename || !*filename)
     return (PCNRITEM) NULL;
@@ -99 +94 @@
                          &ffb, sizeof(ffb), &nm, FIL_QUERYEASIZEL);
   if (!status) {
-#ifdef DEBUG
-    existed = TRUE;
-#endif
     /* file exists */
     DosFindClose(hDir);
@@ -136 +128 @@
   Update:
     if (pci) {                          /* update record? */
-#ifdef DEBUG
-      found = TRUE;
-#endif
       if ((!fForceUpper && !fForceLower && strcmp(pci->pszFileName, filename)) ||
           pci->cbFile != ffb.cbFile || pci->attrFile != ffb.attrFile ||
@@ -150 +139 @@
           ffb.ftimeLastAccess.twosecs * 2 || pci->latime.minutes !=
           ffb.ftimeLastAccess.minutes || pci->latime.hours != ffb.ftimeLastAccess.hours) {      /* changed; update */
-#ifdef DEBUG
-        updated = TRUE;
-#endif
         *ffb.achName = 0;
         ffb.cchName = 0;
@@ -176 +162 @@
     }
     else {                              /* add record */
-#ifdef DEBUG
-      added = TRUE;
-#endif
       if (dcd->type == DIR_FRAME) {
 
@@ -314 +297 @@
            NULL && (INT) pci != -1 && strlen(pci->pszFileName) > 3) {
     /* file doesn't exist; delete record */
-#ifdef DEBUG
-    found = TRUE;
-    deleted = TRUE;
-#endif
     if (!dcd)
       dcd = INSTDATA(hwndCnr);
@@ -330 +309 @@
     PostMsg(hwndCnr, UM_RESCAN, MPVOID, MPVOID);
   }
-#ifdef DEBUG
-  {
-    char s[CCHMAXPATH + 80];
-
-    sprintf(s, "%s:%s%s%s%s%s", filename, (existed) ? " Existed" : "",
-            (updated) ? " Updated" : "", (added) ? " Added" : "",
-            (deleted) ? " Deleted" : "", (found) ? " Found" : "");
-    WinSetWindowText(WinQueryWindow(hwndMain, QW_PARENT), s);
-  }
-#endif
   return pci;
 }