Changeset 614 for trunk

Timestamp:

Apr 19, 2007, 4:24:12 AM (19 years ago)

Author:

Steven Levine

Message:

Reformat logged errors

File:

• trunk/dll/error.c (modified) (3 diffs)

trunk/dll/error.c

@@ -78 +78 @@
   // Append file name and line number
   sprintf(szMsg + strlen(szMsg),
-          GetPString(IDS_GENERR1TEXT), pszFileName, ulLineNo, "  ");
+          GetPString(IDS_GENERR1TEXT), pszFileName, ulLineNo, " ");
 
   // Get last PM error for the current thread
@@ -97 +97 @@
      */
     psz = szMsg + strlen(szMsg);
-    sprintf(psz, "#0x%04x  \"", ERRORIDERROR(pErrInfoBlk->idError));
+    sprintf(psz, "#0x%04x \"", ERRORIDERROR(pErrInfoBlk->idError));
     psz += strlen(psz);
     strcpy(psz, ((PSZ) pErrInfoBlk) + *(PSHORT) pszOffset);
     psz += strlen(psz);
+    // Chop trailing mush
+    psz--;
+    while (*psz == '\r' || *psz == '\n' || *psz == ' ')
+      *psz-- = 0;
+    if (*psz)
+      psz++;
     strcpy(psz, "\"");
     WinFreeErrorInfo(pErrInfoBlk);      // Free resource segment
@@ -273 +279 @@
     fputs(pszMsg, stderr);
     fputc('\n', stderr);
+    fputc('\n', stderr);
     fflush(stderr);
   }