Changeset 1446 in kBuild

Timestamp:

Mar 30, 2008 7:56:34 AM (17 years ago)

Author:

bird

Message:

Using the variable buffer for temp storage is (probably) fast, smaller and better.

File:

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

trunk/src/kmk/function.c

@@ -1548 +1548 @@
   if (v)
     {
-      char *tmp;
       char *buf;
       unsigned int len;
       int var_ctx;
+      size_t off;
+
+      /* Make a copy of the value to the variable buffer since
+         eval_buffer will make changes to its input. */
+
+      off = o - variable_buffer;
+      o = variable_buffer_output (o, v->value, v->value_length + 1);
+      o = variable_buffer + off;
 
       /* Eval the value.  Pop the current variable buffer setting so that the
@@ -1561 +1568 @@
         push_new_variable_scope ();
 
-      tmp = xmalloc (v->value_length + 1);
-      memcpy (tmp, v->value, v->value_length + 1);
-      eval_buffer (tmp);
-      free (tmp);
+      eval_buffer (o);
 
       if (var_ctx)
@@ -4188 +4192 @@
 #ifdef CONFIG_WITH_EVALPLUS
     }
-  else if (!strcmp (funcname, "evalcall"))
-    {
-      /* Evaluate the variable value directly without expanding it first.  */
-      char *tmp;
-
-      install_variable_buffer (&buf, &len);
-
-      tmp = xmalloc (v->value_length + 1);
-      memcpy (tmp, v->value, v->value_length + 1);
-      eval_buffer (tmp);
-      free (tmp);
-
-      restore_variable_buffer (buf, len);
-    }
-  else /* evalcall2: */
-    {
-      /* Expand the body first and then evaluate the output. */
-
-      v->exp_count = EXP_COUNT_MAX;
-      o = variable_expand_string (o, body, flen+3);
-      v->exp_count = 0;
+  else
+    {
+      if (!strcmp (funcname, "evalcall"))
+        {
+          /* Evaluate the variable value without expanding it. We 
+             need a copy since eval_buffer is destructive.  */
+
+          size_t off = o - variable_buffer;
+          o = variable_buffer_output (o, v->value, v->value_length + 1);
+          o = variable_buffer + off;
+        }
+      else
+        {
+          /* Expand the body first and then evaluate the output. */
+
+          v->exp_count = EXP_COUNT_MAX;
+          o = variable_expand_string (o, body, flen+3);
+          v->exp_count = 0;
+        }
 
       install_variable_buffer (&buf, &len);