Changeset 773 for trunk/dll/autoview.c

Timestamp:

Aug 7, 2007, 11:23:27 PM (18 years ago)

Author:

Steven Levine

Message:

Correct some compare directories collector nits
Use BldQuoted... functions
Move BldQuoted... functions near primary callers
Add RUNTYPE_MASK
Use Runtime_Error2 more

File:

• trunk/dll/autoview.c (modified) (7 diffs)

trunk/dll/autoview.c

@@ -351 +351 @@
                       if (info) {
                         sprintf(p, "**%s%s%s\n",
-                                (info->id) ? info->id : "",
-                                (info->id) ? " " : "",
+                                info->id ? info->id : "",
+                                info->id ? " " : "",
                                 GetPString(IDS_ARCHIVETEXT));
                         p += strlen(p);
@@ -412 +412 @@
 
             static FILEFINDBUF4 ffb[130];
-            CHAR fullname[CCHMAXPATH + 4];
-            PSZ pszFullName = fullname, pszCurrFile = currfile, psz;
+            CHAR fullname[CCHMAXPATH + 4];
             HDIR hdir = HDIR_CREATE;
             ULONG x, nm, ml, mc, bufflen;
             PBYTE fb;
             PFILEFINDBUF4 pffbFile;
-            CHAR *buff, *p = "*";
-            APIRET rc;
-
-            psz = p;
-            BldFullPathName(pszFullName, pszCurrFile, psz);
-            *p = 0;
+            PSZ pszBuf;
+            PSZ p;
+            APIRET rc;
+
+            BldFullPathName(fullname, currfile, "*");
             //sprintf(fullname,
             //        "%s%s*",
@@ -452 +450 @@
               }
               bufflen = (CCHMAXPATHCOMP + 42) * nm;
-              buff = xmalloc(bufflen, pszSrcFile, __LINE__);
-              if (buff) {
-                p = buff;
+              pszBuf = xmalloc(bufflen, pszSrcFile, __LINE__);
+              if (pszBuf) {
+                p = pszBuf;
                 *p = 0;
                 fb = (PBYTE) & ffb;
@@ -497 +495 @@
                   x++;
                 }                       // while
-                if (p - buff >= bufflen)
+                if (p - pszBuf >= bufflen)
                   Runtime_Error(pszSrcFile, __LINE__, pszBufOvfMsg);
-                if (*buff)
-                  WinSetWindowText(hwndAutoview, buff);
-                free(buff);
+                if (*pszBuf)
+                  WinSetWindowText(hwndAutoview, pszBuf);
+                free(pszBuf);
               }
             }
@@ -516 +514 @@
           PGEA2 pgea;
           PFEA2 pfea;
-          CHAR *value, *buff, *p, *data;
+          CHAR *value, *pszBuf, *p, *data;
           USHORT len, type, plen, dlen;
           BOOL readonly = FALSE;
@@ -542 +540 @@
                   value[pfea->cbValue] = 0;
                   if (*(USHORT *) value == EAT_MVMT) {
-                    buff = xmalloc(65536, pszSrcFile, __LINE__);
-                    if (buff) {
-                      p = buff;
-                      *buff = 0;
+                    pszBuf = xmalloc(65536, pszSrcFile, __LINE__);
+                    if (pszBuf) {
+                      p = pszBuf;
+                      *pszBuf = 0;
                       data = value + (sizeof(USHORT) * 3);
                       type = *(USHORT *) data;
@@ -579 +577 @@
                         data += sizeof(USHORT);
                       }                 // while
-                      if (p - buff >= 65536) {
+                      if (p - pszBuf >= 65536) {
                         Runtime_Error(pszSrcFile, __LINE__, pszBufOvfMsg);
-                        buff[65535] = 0;        // Try to stay alive
+                        pszBuf[65535] = 0;      // Try to stay alive
                         break;
                       }
-                      WinSetWindowText(hwndAutoMLE, buff);
-                      free(buff);
+                      WinSetWindowText(hwndAutoMLE, pszBuf);
+                      free(pszBuf);
                     }
                   }