Changeset 1811 for trunk/src/kmk/misc.c

Timestamp:

Oct 10, 2008, 7:19:58 AM (17 years ago)

Author:

bird

Message:

kmk: More string length optimizations.

File:

• trunk/src/kmk/misc.c (modified) (4 diffs)

trunk/src/kmk/misc.c

@@ -20 +20 @@
 #include "dep.h"
 #include "debug.h"
+#ifdef CONFIG_WITH_VALUE_LENGTH
+# include <assert.h>
+#endif
 
 /* All bcopy calls in this file can be replaced by memcpy and save a tick or two. */
@@ -83 +86 @@
    This is done by copying the text at LINE into itself.  */
 
+#ifndef CONFIG_WITH_VALUE_LENGTH
 void
 collapse_continuations (char *line)
+#else
+char *
+collapse_continuations (char *line, unsigned int linelen)
+#endif
 {
   register char *in, *out, *p;
@@ -90 +98 @@
   register unsigned int bs_write;
 
+#ifndef CONFIG_WITH_VALUE_LENGTH
   in = strchr (line, '\n');
   if (in == 0)
     return;
+#else
+  assert (strlen (line) == linelen);
+  in = memchr (line, '\n', linelen);
+  if (in == 0)
+      return line + linelen;
+#endif
 
   out = in;
@@ -158 +173 @@
 
   *out = '\0';
+#ifdef CONFIG_WITH_VALUE_LENGTH
+  assert (strchr (line, '\0') == out);
+  return out;
+#endif
 }