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

Timestamp:

Oct 11, 2008, 9:24:07 PM (17 years ago)

Author:

bird

Message:

kmk: no need for the '\0' hack in expand_argument when using allocated_variable_expand_2.

File:

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

trunk/src/kmk/expand.c

@@ -761 +761 @@
   if (!end || *end == '\0')
     return allocated_variable_expand (str);
-#else
-  if (!end)
-      return allocated_variable_expand_2 (str, ~0U, NULL);
-  if (*end == '\0')
-    return allocated_variable_expand_2 (str, end - str, NULL);
-#endif
-
 #ifdef CONFIG_WITH_OPTIMIZATION_HACKS
   {
@@ -791 +784 @@
 # endif
 #endif
+#else  /* CONFIG_WITH_VALUE_LENGTH */
+  if (!end)
+      return allocated_variable_expand_2 (str, ~0U, NULL);
+  return allocated_variable_expand_2 (str, end - str, NULL);
+#endif /* CONFIG_WITH_VALUE_LENGTH */
 }