Changeset 2869 for trunk/kLdr/kLdrHlp.c

Timestamp:

Nov 12, 2006, 3:47:25 AM (19 years ago)

Author:

bird

Message:

the simple testcase works.

File:

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

trunk/kLdr/kLdrHlp.c

@@ -386 +386 @@
  *
  * @returns 0 on success.
- * @returns KLDR_ERR_BUFFER_OVERFLOW on if the buffer is too small (it'll be partially filled).
+ * @returns KLDR_ERR_BUFFER_OVERFLOW on if the buffer is too small.
  * @returns KLDR_ERR_SYMBOL_NOT_FOUND if not found. (Yeah, abusing the status code, but it's only internally...)
  * @returns OS specfic status code on other error.
@@ -407 +407 @@
             kLdrHlpMemCopy(pszVal, pszValue, cch + 1);
         else
-        {
             rc = KLDR_ERR_BUFFER_OVERFLOW;
-            if (cchVal > 1)
-            {
-                kLdrHlpMemCopy(pszVal, pszValue, *pcchVal);
-                pszVal[*pcchVal - 1] = '\0';
-            }
-        }
     }
     else
@@ -425 +418 @@
     SetLastError(0);
     cch = GetEnvironmentVariable(pszVar, pszVal, cchVal);
-    if (cch < cchVal)
+    if (cch > 0 && cch < cchVal)
         return 0;
 
@@ -796 +789 @@
     const uint8_t *pb = (const uint8_t *)pv;
     const uint8_t  b = (uint8_t)ch;
-    while (cb)
+    while (cb-- > 0)
     {
         if (*pb == b)
@@ -811 +804 @@
     const uint8_t *pb1 = (const uint8_t *)pv1;
     const uint8_t *pb2 = (const uint8_t *)pv2;
-    while (cb)
+    while (cb-- > 0)
     {
         if (*pb1 != *pb2)