Changeset 1931 for trunk/src/kmk/read.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/read.c (modified) (10 diffs)

trunk/src/kmk/read.c

@@ -905 +905 @@
                   cp = ap = allocated_variable_expand (p2);
 #else
-                  cp = ap = allocated_variable_expand_2 (p2, eol - p2, NULL);
+                  unsigned int buf_len;
+                  cp = ap = allocated_variable_expand_3 (p2, eol - p2, NULL, &buf_len);
 #endif
 
@@ -917 +918 @@
                     }
 
+#ifndef CONFIG_WITH_VALUE_LENGTH
                   free (ap);
+#else
+                  recycle_variable_buffer (ap, buf_len);
+#endif
                 }
             }
@@ -939 +944 @@
               cp = ap = allocated_variable_expand (p2);
 #else
-              cp = ap = allocated_variable_expand_2 (p2, eol - p2, NULL);
+              unsigned int buf_len;
+              cp = ap = allocated_variable_expand_3 (p2, eol - p2, NULL, &buf_len);
 #endif
 
@@ -952 +958 @@
                 }
 
+#ifndef CONFIG_WITH_VALUE_LENGTH
               free (ap);
+#else
+              recycle_variable_buffer (ap, buf_len);
+#endif
             }
           goto rule_complete;
@@ -995 +1005 @@
                             ? incdep_queue : incdep_flush;
           char *free_me = NULL;
+          unsigned int buf_len;
           char *name = p2;
 
@@ -1000 +1011 @@
             {
               unsigned int name_len;
-              free_me = name = allocated_variable_expand_2 (name, eol - name, &name_len);
+              free_me = name = allocated_variable_expand_3 (name, eol - name, &name_len, &buf_len);
               eol = name + name_len;
               while (isspace ((unsigned char)*name))
@@ -1013 +1024 @@
 
           if (free_me)
-            free (free_me);
+            recycle_variable_buffer (free_me, buf_len);
           goto rule_complete;
         }
@@ -1032 +1043 @@
           p = allocated_variable_expand (p2);
 #else
-          p = allocated_variable_expand_2 (p2, eol - p2, NULL);
+          unsigned int buf_len;
+          p = allocated_variable_expand_3 (p2, eol - p2, NULL, &buf_len);
 #endif
 
@@ -1038 +1050 @@
           if (*p == '\0')
             {
+#ifndef CONFIG_WITH_VALUE_LENGTH
               free (p);
+#else
+              recycle_variable_buffer (p, buf_len);
+#endif
               continue;
             }
@@ -1053 +1069 @@
                               &nameseq_cache);
 #endif
+#ifndef CONFIG_WITH_VALUE_LENGTH
           free (p);
+#else
+          recycle_variable_buffer (p, buf_len);
+#endif
 
           /* Save the state of conditionals and start