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

Timestamp:

Oct 24, 2008, 6:50:10 AM (17 years ago)

Author:

bird

Message:

kmk: Inlined much of handle_function/lookup_function so variable_expand_string_2 can avoid having to make the call for every variable it encounters. Also fixed the func_char_map generation.

File:

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

trunk/src/kmk/expand.c

@@ -549 +549 @@
             op = o;
             begp = p;
-            if (handle_function (&op, &begp, eos))
+            end = may_be_function_name (p + 1, eos);
+            if (    end
+                &&  handle_function (&op, &begp, end, eos))
               {
                 o = op;
@@ -766 +768 @@
   memcpy (tmp, str, end - str);
   tmp[end - str] = '\0';
+  return allocated_variable_expand (tmp);
 #else  /* CONFIG_WITH_VALUE_LENGTH */
   if (!end)