Changeset 1809 for trunk/src/kmk/function.c

Timestamp:

Oct 10, 2008, 4:27:38 AM (17 years ago)

Author:

bird

Message:

kmk: More length and alloc optimizations. Made all the length optimizations from yesterday CONFIG_WITH_VALUE_LENGTH instead of KMK.

File:

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

trunk/src/kmk/function.c

@@ -931 +931 @@
   char *list = expand_argument (argv[1], NULL);
   const char *body = argv[2];
-#ifdef KMK
+#ifdef CONFIG_WITH_VALUE_LENGTH
   long body_len = strlen (body);
-#endif /* KMK - optimization */
+#endif
 
   int doneany = 0;
@@ -947 +947 @@
   while ((p = find_next_token (&list_iterator, &len)) != 0)
     {
-#ifndef KMK
+#ifndef CONFIG_WITH_VALUE_LENGTH
       char *result = 0;
-#endif /* KMK - optimization */
-#ifdef CONFIG_WITH_VALUE_LENGTH
+
+      free (var->value);
+      var->value = savestring (p, len);
+      result = allocated_variable_expand (body);
+
+      o = variable_buffer_output (o, result, strlen (result));
+      o = variable_buffer_output (o, " ", 1);
+      doneany = 1;
+      free (result);
+#else  /* CONFIG_WITH_VALUE_LENGTH */
       if (len >= (unsigned int)var->value_alloc_len)
         {
@@ -960 +968 @@
       var->value[len] = '\0';
       var->value_length = len;
-#else
-      free (var->value);
-      var->value = savestring (p, len);
-#endif
-
-#ifndef KMK
-      result = allocated_variable_expand (body);
-
-      o = variable_buffer_output (o, result, strlen (result));
-      o = variable_buffer_output (o, " ", 1);
-      doneany = 1;
-      free (result);
-#else  /* KMK - optimization */
+
       variable_expand_string_2 (o, body, body_len, &o);
       o = variable_buffer_output (o, " ", 1);
       doneany = 1;
-#endif /* KMK - optimization */
+#endif /* CONFIG_WITH_VALUE_LENGTH */
     }
 
@@ -4314 +4310 @@
 
       v->exp_count = EXP_COUNT_MAX;
-#ifndef KMK
+#ifndef CONFIG_WITH_VALUE_LENGTH
       o = variable_expand_string (o, body, flen+3);
       v->exp_count = 0;
 
       o += strlen (o);
-#else  /* KMK - optimization */
+#else  /* CONFIG_WITH_VALUE_LENGTH */
       variable_expand_string_2 (o, body, flen+3, &o);
       v->exp_count = 0;
-#endif /* KMK - optimization */
+#endif /* CONFIG_WITH_VALUE_LENGTH */
 #ifdef CONFIG_WITH_EVALPLUS
     }