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

Timestamp:

Oct 24, 2008, 9:02:48 PM (17 years ago)

Author:

bird

Message:

kmk: recycle more allocate_variable_expand_* results.

File:

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

trunk/src/kmk/expand.c

@@ -60 +60 @@
 };
 struct recycled_buffer *recycled_head;
-static char *
-allocated_variable_expand_3 (const char *line, unsigned int length,
-                             unsigned int *value_lenp,
-                             unsigned int *buffer_lengthp);
-static void
-recycle_variable_buffer (char *buffer, unsigned int length);
-
-#endif
+#endif /* CONFIG_WITH_VALUE_LENGTH */
 
 
@@ -1071 +1064 @@
 }
 
-/* Handles a special case for variable_expand_string2 where the variable
-   name is expanded.  This variant allows the variable_buffer to
-   be recycled and thus avoid bothering with a slow free implementation
-   (darwin is horrible here).  */
-
-static char *
+/* Initially created for handling a special case for variable_expand_string2
+   where the variable name is expanded and freed right afterwards.  This
+   variant allows the variable_buffer to be recycled and thus avoid bothering
+   with a slow free implementation. (Darwin is horrible slow.)  */
+
+char *
 allocated_variable_expand_3 (const char *line, unsigned int length,
                              unsigned int *value_lenp,
@@ -1090 +1083 @@
 
   value = variable_expand_string_2 (NULL, line, len, &eol);
-  *value_lenp = eol - value;
+  if (value_lenp)
+    *value_lenp = eol - value;
   *buffer_lengthp = variable_buffer_length;
 
@@ -1100 +1094 @@
 
 /* recycle a buffer. */
-static void
+
+void
 recycle_variable_buffer (char *buffer, unsigned int length)
 {
@@ -1133 +1128 @@
 restore_variable_buffer (char *buf, unsigned int len)
 {
+#ifndef CONFIG_WITH_VALUE_LENGTH
   free (variable_buffer);
+#else
+  if (variable_buffer)
+    recycle_variable_buffer (variable_buffer, variable_buffer_length);
+#endif
 
   variable_buffer = buf;