Changeset 1610 for trunk/src/kmk/variable.c

Timestamp:

May 8, 2008, 5:36:35 AM (17 years ago)

Author:

bird

Message:

Fixed prepend w/ expansion (would append instead of prepend). Optimized append_expanded_string_to_variable().

File:

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

trunk/src/kmk/variable.c

@@ -1591 +1591 @@
 
 #ifdef CONFIG_WITH_VALUE_LENGTH
+/* Worker function for do_variable_definition_append() and
+   append_expanded_string_to_variable().
+   The APPEND argument indicates whether it's an append or prepend operation. */
+void append_string_to_variable (struct variable *v, const char *value, unsigned int value_len, int append)
+{
+  /* The previous definition of the variable was recursive.
+     The new value is the unexpanded old and new values. */
+  unsigned int new_value_len = value_len + (v->value_length != 0 ? 1 + v->value_length : 0);
+  int done_1st_prepend_copy = 0;
+
+  /* adjust the size. */
+  if ((unsigned)v->value_alloc_len <= new_value_len + 1)
+    {
+      v->value_alloc_len *= 2;
+      if (v->value_alloc_len < new_value_len + 1)
+          v->value_alloc_len = (new_value_len + 1 + value_len + 0x7f) + ~0x7fU;
+      if (append || !v->value_length)
+        v->value = xrealloc (v->value, v->value_alloc_len);
+      else
+        {
+          /* avoid the extra memcpy the xrealloc may have to do */
+          char *new_buf = xmalloc (v->value_alloc_len);
+          memcpy (&new_buf[value_len + 1], v->value, v->value_length + 1);
+          done_1st_prepend_copy = 1;
+          free (v->value);
+          v->value = new_buf;
+        }
+    }
+
+  /* insert the new bits */
+  if (v->value_length != 0)
+    {
+      if (append)
+        {
+          v->value[v->value_length] = ' ';
+          memcpy (&v->value[v->value_length + 1], value, value_len + 1);
+        }
+      else
+        {
+          if (!done_1st_prepend_copy)
+            memmove (&v->value[value_len + 1], v->value, v->value_length + 1);
+          v->value[value_len] = ' ';
+          memcpy (v->value, value, value_len);
+        }
+    }
+  else
+    memcpy (v->value, value, value_len + 1);
+  v->value_length = new_value_len;
+}
+
 static struct variable *
 do_variable_definition_append (const struct floc *flocp, struct variable *v, const char *value,
@@ -1617 +1667 @@
      This is a heavily exercised code path in kBuild. */
   if (v->recursive)
-    {
-      /* The previous definition of the variable was recursive.
-         The new value is the unexpanded old and new values. */
-      unsigned int value_len = strlen (value);
-      unsigned int new_value_len = value_len + (v->value_length != 0 ? 1 + v->value_length : 0);
-      int done_1st_prepend_copy = 0;
-
-      /* adjust the size. */
-      if ((unsigned)v->value_alloc_len <= new_value_len + 1)
-        {
-          v->value_alloc_len *= 2;
-          if (v->value_alloc_len < new_value_len + 1)
-              v->value_alloc_len = (new_value_len + 1 + value_len + 0x7f) + ~0x7fU;
-          if (append || !v->value_length)
-            v->value = xrealloc (v->value, v->value_alloc_len);
-          else
-            {
-              /* avoid the extra memcpy the xrealloc may have to do */
-              char *new_buf = xmalloc (v->value_alloc_len);
-              memcpy (&new_buf[value_len + 1], v->value, v->value_length + 1);
-              done_1st_prepend_copy = 1;
-              free (v->value);
-              v->value = new_buf;
-            }
-        }
-
-      /* insert the new bits */
-      if (v->value_length != 0)
-        {
-          if (append)
-            {
-              v->value[v->value_length] = ' ';
-              memcpy (&v->value[v->value_length + 1], value, value_len + 1);
-            }
-          else
-            {
-              if (!done_1st_prepend_copy)
-                memmove (&v->value[value_len + 1], v->value, v->value_length + 1);
-              v->value[value_len] = ' ';
-              memcpy (v->value, value, value_len);
-            }
-        }
-      else
-        memcpy (v->value, value, value_len + 1);
-      v->value_length = new_value_len;
-    }
+    append_string_to_variable (v, value, strlen (value), append);
   else
-    {
-      /* The previous definition of the variable was simple.
-         The new value comes from the old value, which was expanded
-         when it was set; and from the expanded new value. */
-      append_expanded_string_to_variable(v, value);
-    }
+    /* The previous definition of the variable was simple.
+       The new value comes from the old value, which was expanded
+       when it was set; and from the expanded new value. */
+    append_expanded_string_to_variable (v, value, append);
 
   /* update the variable */