Changeset 1827 for trunk/src/kmk/read.c

Timestamp:

Oct 11, 2008, 9:12:10 AM (17 years ago)

Author:

bird

Message:

kmk: more length optimizations.

File:

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

trunk/src/kmk/read.c

@@ -469 +469 @@
 
 int
+#ifndef CONFIG_WITH_VALUE_LENGTH
 eval_buffer (char *buffer)
+#else
+eval_buffer (char *buffer, char *eos)
+#endif
 {
   struct ebuffer ebuf;
@@ -479 +483 @@
   /* Evaluate the buffer */
 
+#ifndef CONFIG_WITH_VALUE_LENGTH
   ebuf.size = strlen (buffer);
+#else
+  ebuf.size = eos - buffer;
+  ebuf.eol = eos;
+  assert(strchr(buffer, '\0') == eos);
+#endif
   ebuf.buffer = ebuf.bufnext = ebuf.bufstart = buffer;
   ebuf.fp = NULL;
-#ifdef CONFIG_WITH_VALUE_LENGTH
-  ebuf.eol = ebuf.buffer + ebuf.size;
-#endif
 
   ebuf.floc = *reading_file;
@@ -1954 +1961 @@
       if ((size_t)buf_pos & 7)
         buf_pos = variable_buffer_output (buf_pos, "\0\0\0\0\0\0\0\0",
-                                          8 - (size_t)buf_pos & 7);
-      s2 = variable_expand_string (buf_pos, s2, l);
+                                          8 - ((size_t)buf_pos & 7));
+      s2 = variable_expand_string_2 (buf_pos, s2, l, &buf_pos);
 #endif
 #ifdef CONFIG_WITH_SET_CONDITIONALS