Changeset 1827 for trunk/src/kmk/variable.h

Timestamp:

Oct 11, 2008, 9:12:10 AM (17 years ago)

Author:

bird

Message:

kmk: more length optimizations.

File:

• trunk/src/kmk/variable.h (modified) (3 diffs)

trunk/src/kmk/variable.h

@@ -142 +142 @@
 # define allocated_variable_expand(line) \
   allocated_variable_expand_2 (line, -1, NULL)
-char *allocated_variable_expand_2(const char *line, unsigned int length, unsigned int *value_len);
+char *allocated_variable_expand_2(const char *line, unsigned int length, unsigned int *value_lenp);
 #endif /* CONFIG_WITH_VALUE_LENGTH */
 char *expand_argument (const char *str, const char *end);
+#ifndef CONFIG_WITH_VALUE_LENGTH
 char *variable_expand_string (char *line, const char *string, long length);
-#ifdef CONFIG_WITH_VALUE_LENGTH
+#else  /* CONFIG_WITH_VALUE_LENGTH */
 char *variable_expand_string_2 (char *line, const char *string, long length, char **eol);
-#endif
+__inline static char *
+variable_expand_string (char *line, const char *string, long length)
+{
+    char *ignored;
+    return variable_expand_string_2 (line, string, length, &ignored);
+}
+#endif /* CONFIG_WITH_VALUE_LENGTH */
 void install_variable_buffer (char **bufp, unsigned int *lenp);
 void restore_variable_buffer (char *buf, unsigned int len);
@@ -157 +164 @@
 
 /* function.c */
+#ifndef CONFIG_WITH_VALUE_LENGTH
 int handle_function (char **op, const char **stringp);
+#else
+int handle_function (char **op, const char **stringp, const char *eol);
+#endif
 int pattern_matches (const char *pattern, const char *percent, const char *str);
 char *subst_expand (char *o, const char *text, const char *subst,
@@ -171 +182 @@
 
 /* expand.c */
+#ifndef CONFIG_WITH_VALUE_LENGTH
 char *recursively_expand_for_file (struct variable *v, struct file *file);
 #define recursively_expand(v)   recursively_expand_for_file (v, NULL)
+#else
+char *recursively_expand_for_file (struct variable *v, struct file *file,
+                                   unsigned int *value_lenp);
+#define recursively_expand(v)   recursively_expand_for_file (v, NULL, NULL)
+#endif
 
 /* variable.c */