Changeset 2828 for trunk/kLdr/kLdrHlp.c

Timestamp:

Oct 22, 2006, 8:21:04 PM (19 years ago)

Author:

bird

Message:

Lx header. renaming some helpers.

File:

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

trunk/kLdr/kLdrHlp.c

@@ -61 +61 @@
     if (!rc)
     {
-        size_t cch = strlen(pszValue);
+        size_t cch = kLdrHlpStrLen(pszValue);
         if (pszVal)
         {
             if (*pcchVal > cch)
             {
-                memcpy(pszVal, pszValue, cch + 1);
+                kLdrHlpMemCopy(pszVal, pszValue, cch + 1);
                 *pcchVal = cch;
             }
             else if (*pcchVal)
             {
-                memcpy(pszVal, pszValue, *pcchVal);
+                kLdrHlpMemCopy(pszVal, pszValue, *pcchVal);
                 pszVal[*pcchVal - 1] = '\0';
                 rc = ERROR_BUFFER_OVERFLOW;
@@ -167 +167 @@
 
     DosWrite((HFILE)2, s_szMsg1, sizeof(s_szMsg1) - 1, &cbWritten);
-    DosWrite((HFILE)2, pszExpr, kLdrStrLen(pszExpr), &cbWritten);
+    DosWrite((HFILE)2, pszExpr, kLdrHlpStrLen(pszExpr), &cbWritten);
     DosWrite((HFILE)2, s_szMsg2, sizeof(s_szMsg2) - 1, &cbWritten);
-    DosWrite((HFILE)2, pszFile, kLdrStrLen(pszFile), &cbWritten);
+    DosWrite((HFILE)2, pszFile, kLdrHlpStrLen(pszFile), &cbWritten);
     DosWrite((HFILE)2, "(", sizeof("(") - 1, &cbWritten);
     int2dec(szLine, iLine);
-    DosWrite((HFILE)2, szLine, kLdrStrLen(szLine), &cbWritten);
+    DosWrite((HFILE)2, szLine, kLdrHlpStrLen(szLine), &cbWritten);
     DosWrite((HFILE)2, ") ", sizeof(") ") - 1, &cbWritten);
-    DosWrite((HFILE)2, pszFunction, kLdrStrLen(pszFunction), &cbWritten);
+    DosWrite((HFILE)2, pszFunction, kLdrHlpStrLen(pszFunction), &cbWritten);
     DosWrite((HFILE)2, s_szMsg3, sizeof(s_szMsg3) - 1, &cbWritten);
 
@@ -186 +186 @@
 
     WriteFile(hStdErr, s_szMsg1, sizeof(s_szMsg1) - 1, &cbWritten, NULL);
-    WriteFile(hStdErr, pszExpr, kLdrStrLen(pszExpr), &cbWritten, NULL);
+    WriteFile(hStdErr, pszExpr, kLdrHlpStrLen(pszExpr), &cbWritten, NULL);
     WriteFile(hStdErr, s_szMsg2, sizeof(s_szMsg2) - 1, &cbWritten, NULL);
-    WriteFile(hStdErr, pszFile, kLdrStrLen(pszFile), &cbWritten, NULL);
+    WriteFile(hStdErr, pszFile, kLdrHlpStrLen(pszFile), &cbWritten, NULL);
     WriteFile(hStdErr, "(", sizeof("(") - 1, &cbWritten, NULL);
     int2dec(szLine, iLine);
-    WriteFile(hStdErr, szLine, kLdrStrLen(szLine), &cbWritten, NULL);
+    WriteFile(hStdErr, szLine, kLdrHlpStrLen(szLine), &cbWritten, NULL);
     WriteFile(hStdErr, ") ", sizeof(") ") - 1, &cbWritten, NULL);
-    WriteFile(hStdErr, pszFunction, kLdrStrLen(pszFunction), &cbWritten, NULL);
+    WriteFile(hStdErr, pszFunction, kLdrHlpStrLen(pszFunction), &cbWritten, NULL);
     WriteFile(hStdErr, s_szMsg3, sizeof(s_szMsg3) - 1, &cbWritten, NULL);