Changeset 2832 for trunk/kLdr/kLdrHlp.c

Timestamp:

Oct 25, 2006, 12:26:01 AM (19 years ago)

Author:

bird

Message:

specified more of the api.

File:

• trunk/kLdr/kLdrHlp.c (modified) (2 diffs)

trunk/kLdr/kLdrHlp.c

@@ -507 +507 @@
 
 /**
+ * Writes a assert string with unix lineendings.
+ *
+ * @param   pszMsg  The string.
+ */
+static void kldrHlpAssertWrite(const char *pszMsg)
+{
+#if defined(__OS2__) || defined(__WIN__)
+    /*
+     * Line by line.
+     */
+    ULONG       cbWritten;
+    const char *pszNl = kLdrHlpStrChr(pszMsg, '\n');
+    while (pszNl || *pszMsg)
+    {
+        cbWritten = pszNl - pszMsg;
+
+#ifdef __OS2__
+        if (cbWritten)
+            DosWrite((HFILE)2, pszMsg, cbWritten, &cbWritten);
+        DosWrite((HFILE)2, "\r\n", 2, &cbWritten);
+#else /* __WIN32__ */
+        if (cbWritten)
+            WriteFile((HANDLE)STD_ERROR_HANDLE, pszMsg, cbWritten, &cbWritten, NULL);
+        WriteFile((HANDLE)STD_ERROR_HANDLE, "\r\n", 2, &cbWritten, NULL);
+#endif
+
+        /* next */
+        pszMsg = pszNl + 1;
+        pszNl = kLdrHlpStrChr(pszMsg, '\n');
+    }
+
+    /*
+     * Remaining incomplete line.
+     */
+    if (*pszMsg)
+    {
+        cbWritten = kLdrHlpStrLen(pszMsg);
+#ifdef __OS2__
+        DosWrite((HFILE)2, pszMsg, cbWritten, &cbWritten);
+#else /* __WIN32__ */
+        WriteFile((HANDLE)STD_ERROR_HANDLE, pszMsg, cbWritten, &cbWritten, NULL);
+#endif
+    }
+
+#else
+# error "port me"
+#endif
+}
+
+
+/**
  * Internal worker for the kLdrHlpAssert() macro.
  *
@@ -516 +567 @@
 void    kldrHlpAssertMsg(const char *pszExpr, const char *pszFile, unsigned iLine, const char *pszFunction)
 {
-#ifdef __OS2__
-    static const char   s_szMsg1[] = "\r\n!!!kLdr Assertion Failed!!!\n\rExpression: ";
-    static const char   s_szMsg2[] = "\r\nAt: ";
-    static const char   s_szMsg3[] = "\r\n";
-    ULONG               cbWritten;
-    char                szLine[16];
-
-    DosWrite((HFILE)2, s_szMsg1, sizeof(s_szMsg1) - 1, &cbWritten);
-    DosWrite((HFILE)2, pszExpr, kLdrHlpStrLen(pszExpr), &cbWritten);
-    DosWrite((HFILE)2, s_szMsg2, sizeof(s_szMsg2) - 1, &cbWritten);
-    DosWrite((HFILE)2, pszFile, kLdrHlpStrLen(pszFile), &cbWritten);
-    DosWrite((HFILE)2, "(", sizeof("(") - 1, &cbWritten);
+    char szLine[16];
+
+    kldrHlpAssertWrite("\n!!!kLdr Assertion Failed!!!\nExpression: ");
+    kldrHlpAssertWrite(pszExpr);
+    kldrHlpAssertWrite("\nAt: ");
+    kldrHlpAssertWrite(pszFile);
+    kldrHlpAssertWrite("(");
     int2dec(szLine, iLine);
-    DosWrite((HFILE)2, szLine, kLdrHlpStrLen(szLine), &cbWritten);
-    DosWrite((HFILE)2, ") ", sizeof(") ") - 1, &cbWritten);
-    DosWrite((HFILE)2, pszFunction, kLdrHlpStrLen(pszFunction), &cbWritten);
-    DosWrite((HFILE)2, s_szMsg3, sizeof(s_szMsg3) - 1, &cbWritten);
-
-#elif defined(__WIN__)
-    static const char   s_szMsg1[] = "\r\n!!!kLdr Assertion Failed!!!\n\rExpression: ";
-    static const char   s_szMsg2[] = "\r\nAt: ";
-    static const char   s_szMsg3[] = "\r\n";
-    DWORD               cbWritten;
-    char                szLine[16];
-    const HANDLE        hStdErr = (HANDLE)STD_ERROR_HANDLE;
-
-    WriteFile(hStdErr, s_szMsg1, sizeof(s_szMsg1) - 1, &cbWritten, NULL);
-    WriteFile(hStdErr, pszExpr, kLdrHlpStrLen(pszExpr), &cbWritten, NULL);
-    WriteFile(hStdErr, s_szMsg2, sizeof(s_szMsg2) - 1, &cbWritten, NULL);
-    WriteFile(hStdErr, pszFile, kLdrHlpStrLen(pszFile), &cbWritten, NULL);
-    WriteFile(hStdErr, "(", sizeof("(") - 1, &cbWritten, NULL);
-    int2dec(szLine, iLine);
-    WriteFile(hStdErr, szLine, kLdrHlpStrLen(szLine), &cbWritten, NULL);
-    WriteFile(hStdErr, ") ", sizeof(") ") - 1, &cbWritten, NULL);
-    WriteFile(hStdErr, pszFunction, kLdrHlpStrLen(pszFunction), &cbWritten, NULL);
-    WriteFile(hStdErr, s_szMsg3, sizeof(s_szMsg3) - 1, &cbWritten, NULL);
-
-#else
-# error "Port me"
-#endif
-}
-
+    kldrHlpAssertWrite(szLine);
+    kldrHlpAssertWrite(") ");
+    kldrHlpAssertWrite(pszFunction);
+    kldrHlpAssertWrite("\n");
+}
+
+
+#ifdef kLdrHlpStrChr_needed
+char   *kLdrHlpStrChr(const char *psz, int ch)
+{
+    while (*psz)
+    {
+        if (*psz == ch)
+            return (char *)psz;
+        psz++;
+    }
+    return NULL;
+}
+#endif
+
+
+#ifdef kLdrHlpStrChr_needed
+void   *kLdrHlpMemChr(const void *pv, int ch, size_t cb)
+{
+    const uint8_t *pb = (const uint8_t *)pv;
+    const uint8_t  b = (uint8_t)ch;
+    while (cb)
+    {
+        if (*pb == b)
+            return (void *)pb;
+        pb++;
+    }
+    return NULL;
+}
+#endif
+