Changeset 1811 in kBuild for trunk/src/kmk/variable.c

Timestamp:

Oct 10, 2008 5:19:58 AM (16 years ago)

Author:

bird

Message:

kmk: More string length optimizations.

File:

• trunk/src/kmk/variable.c (modified) (6 diffs)

trunk/src/kmk/variable.c

@@ -921 +921 @@
               else
                 {
+#ifndef CONFIG_WITH_VALUE_LENGTH
                   v = do_variable_definition (
                     &p->variable.fileinfo, p->variable.name,
                     p->variable.value, p->variable.origin,
                     p->variable.flavor, 1);
+#else
+                  v = do_variable_definition_2 (
+                    &p->variable.fileinfo, p->variable.name,
+                    p->variable.value, p->variable.value_length, 0, 0,
+                    p->variable.origin, p->variable.flavor, 1);
+#endif
                 }
 
@@ -2030 +2037 @@
 
 struct variable *
+#ifndef CONFIG_WITH_VALUE_LENGTH
 parse_variable_definition (struct variable *v, char *line)
+#else
+parse_variable_definition (struct variable *v, char *line, char *eos)
+#endif
 {
   register int c;
@@ -2119 +2130 @@
   v->value = p;
 #ifdef CONFIG_WITH_VALUE_LENGTH
-  v->value_length = v->value_alloc_len = -1;
+  v->value_alloc_len = -1;
+  v->value_length = eos != NULL ? eos - p : -1;
+  assert (eos == NULL || strchr (p, '\0') == eos);
 #endif
 
@@ -2153 +2166 @@
 
 struct variable *
+#ifndef CONFIG_WITH_VALUE_LENGTH
 try_variable_definition (const struct floc *flocp, char *line,
                          enum variable_origin origin, int target_var)
+#else
+try_variable_definition (const struct floc *flocp, char *line, char *eos,
+                         enum variable_origin origin, int target_var)
+#endif
 {
   struct variable v;
@@ -2164 +2182 @@
     v.fileinfo.filenm = 0;
 
+#ifndef CONFIG_WITH_VALUE_LENGTH
   if (!parse_variable_definition (&v, line))
     return 0;
@@ -2169 +2188 @@
   vp = do_variable_definition (flocp, v.name, v.value,
                                origin, v.flavor, target_var);
+#else
+  if (!parse_variable_definition (&v, line, eos))
+    return 0;
+
+  vp = do_variable_definition_2 (flocp, v.name, v.value,
+                                 v.value_length != -1 ? v.value_length : ~0U,
+                                 0, NULL, origin, v.flavor, target_var);
+#endif
 
   free (v.name);