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

Timestamp:

Oct 28, 2008, 12:25:49 AM (17 years ago)

Author:

bird

Message:

kmk: Some cleanup.

File:

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

trunk/src/kmk/expand.c

@@ -81 +81 @@
       unsigned int offset = ptr - variable_buffer;
       variable_buffer_length = (newlen + 100 > 2 * variable_buffer_length
-                               ? newlen + 100
-                               : 2 * variable_buffer_length);
+                                ? newlen + 100
+                                : 2 * variable_buffer_length);
       variable_buffer = xrealloc (variable_buffer, variable_buffer_length);
       ptr = variable_buffer + offset;
@@ -116 +116 @@
       variable_buffer[0] = '\0';
     }
-#else
+#else  /* CONFIG_WITH_VALUE_LENGTH */
   if (variable_buffer == 0)
     {
@@ -123 +123 @@
       variable_buffer[0] = '\0';
     }
-#endif
+#endif /* CONFIG_WITH_VALUE_LENGTH */
 
   return variable_buffer;
@@ -210 +210 @@
 /* Expand a simple reference to variable NAME, which is LENGTH chars long.  */
 
-#if defined(__GNUC__) || defined(_MSC_VER) /* bird added MSC */
+#if defined(__GNUC__)
 __inline
+#elif defined (MY_INLINE) /* bird */
+MY_INLINE
 #endif
 static char *
@@ -236 +238 @@
      unsigned int value_len;
 
+     /* XXX: Inline recursively_expand_for_file() here and what it calls, try
+             make use of O directly instead wasting time on an intermediate buffer.  */
      value = recursively_expand_for_file (v, NULL, &value_len);
      o = variable_buffer_output (o, value, value_len);
@@ -760 +764 @@
 #ifndef CONFIG_WITH_VALUE_LENGTH
   return variable_expand_string(NULL, line, (long)-1);
-#else
+#else  /* CONFIG_WITH_VALUE_LENGTH */
   char *s;
 
@@ -770 +774 @@
     }
   return variable_expand_string_2 (NULL, line, (long)-1, &s);
-#endif
+#endif /* CONFIG_WITH_VALUE_LENGTH */
 }
 
@@ -793 +797 @@
   if (!end || *end == '\0')
     return allocated_variable_expand (str);
+
   tmp = alloca (end - str + 1);
   memcpy (tmp, str, end - str);
   tmp[end - str] = '\0';
+
   return allocated_variable_expand (tmp);
 #else  /* CONFIG_WITH_VALUE_LENGTH */
@@ -844 +850 @@
 {
   char *result;
-  struct variable_set_list *save;
-  const struct floc *reading_file_saved;
+  struct variable_set_list *savev;
+  const struct floc *savef;
   long len = length == ~0U ? (long)-1 : (long)length;
   char *eol;
@@ -856 +862 @@
   else
     {
-      save = current_variable_set_list;
+      savev = current_variable_set_list;
       current_variable_set_list = file->variables;
-      reading_file_saved = reading_file;
+
+      savef = reading_file;
       if (file->cmds && file->cmds->fileinfo.filenm)
         reading_file = &file->cmds->fileinfo;
       else
         reading_file = 0;
+
       result = variable_expand_string_2 (o, line, len, &eol);
-      current_variable_set_list = save;
-      reading_file = reading_file_saved;
+
+      current_variable_set_list = savev;
+      reading_file = savef;
     }
 
@@ -1006 +1015 @@
   variable_buffer = 0;
 
-  assert ((unsigned int)v->length == strlen (v->name));
+  assert ((unsigned int)v->length == strlen (v->name)); /* bird */
   val = variable_append (v->name, strlen (v->name), current_variable_set_list);
   variable_buffer_output (val, "", 1);