Changeset 1834 for trunk/src/kmk/expand.c

Timestamp:

Oct 11, 2008, 9:07:29 PM (17 years ago)

Author:

bird

Message:

kmk: assertions.

File:

• trunk/src/kmk/expand.c (modified) (3 diffs)

trunk/src/kmk/expand.c

@@ -487 +487 @@
   if (length < 0)
     length = strlen (string);
+  else
+    MY_ASSERT_MSG (string + length == (p1 = memchr (string, '\0', length)) || !p1, ("len=%ld p1=%p %s\n", length, p1, line));
 
   /* Simple 1: Emptry string. */
@@ -551 +553 @@
                 o = op;
                 p = begp;
+                assert (!memchr (variable_buffer + line_offset, '\0', o - variable_buffer + line_offset));
                 break;
               }
@@ -707 +710 @@
   o = variable_buffer_output (o, "\0", 2); /* KMK: compensate for the strlen + 1 that was removed above. */
   *eolp = o - 2;
-  assert (strchr (variable_buffer + line_offset, '\0') == *eolp);
+  MY_ASSERT_MSG (strchr (variable_buffer + line_offset, '\0') == *eolp,
+                 ("expected=%d actual=%d\nlength=%ld string=%.*s\n",
+                  (int)(*eolp - variable_buffer + line_offset), (int)strlen(variable_buffer + line_offset),
+                  length, (int)length, string));
   return (variable_buffer + line_offset);
 }