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

Timestamp:

Apr 21, 2008, 12:46:03 AM (17 years ago)

Author:

bird

Message:

Use the value_length if possible (saves strlen). Assert its correctness instead of fallbacks.

File:

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

trunk/src/kmk/expand.c

@@ -186 +186 @@
     return o;
 
+#ifdef CONFIG_WITH_VALUE_LENGTH
+  if (!v->recursive)
+    {
+      assert (v->value_length == strlen (v->value));
+      o = variable_buffer_output (o, v->value, v->value_length);
+    }
+  else
+   {
+     value = recursively_expand (v);
+     o = variable_buffer_output (o, value, strlen (value));
+     free (value);
+   }
+#else  /* !CONFIG_WITH_VALUE_LENGTH */
   value = (v->recursive ? recursively_expand (v) : v->value);
 
@@ -192 +205 @@
   if (v->recursive)
     free (value);
+#endif /* !CONFIG_WITH_VALUE_LENGTH */
 
   return o;
@@ -572 +586 @@
   if (buf > variable_buffer)
     buf = variable_buffer_output (buf, " ", 1);
+#ifdef CONFIG_WITH_VALUE_LENGTH
+  assert (v->value_length == strlen (v->value));
+#endif
 
   /* Either expand it or copy it, depending.  */
   if (! v->recursive)
 #ifdef CONFIG_WITH_VALUE_LENGTH
-    return variable_buffer_output (buf, v->value,
-                                   v->value_length >= 0 ? v->value_length : strlen (v->value));
+    return variable_buffer_output (buf, v->value, v->value_length);
 #else
     return variable_buffer_output (buf, v->value, strlen (v->value));
@@ -583 +599 @@
 
 #ifdef CONFIG_WITH_VALUE_LENGTH
-  buf = variable_expand_string (buf, v->value, v->value_length >= 0 ? v->value_length : strlen (v->value));
+  buf = variable_expand_string (buf, v->value, v->value_length);
 #else
   buf = variable_expand_string (buf, v->value, strlen (v->value));