Changeset 2154 in kBuild for trunk/src

Timestamp:

Dec 29, 2008 12:24:20 AM (16 years ago)

Author:

bird

Message:

kmk: $(translate ) changes and testcase.

Location:

trunk/src/kmk

Files:

• function.c (modified) (4 diffs)
• tests/scripts/functions/translate (added)

trunk/src/kmk/function.c

@@ -2541 +2541 @@
 
 /*
-  $(translate string, new-set[, old-set[, pad-char]])
+  $(translate string, from-set[, to-set[, pad-char]])
 
   XXX: This doesn't take multibyte locales into account.
@@ -2548 +2548 @@
 func_translate (char *o, char **argv, const char *funcname UNUSED)
 {
-  const unsigned char *str     = (const unsigned char *)argv[0];
-  const unsigned char *new_set = (const unsigned char *)argv[1];
-  const char          *old_set = argv[2] != NULL ? argv[2] : "";
+  const unsigned char *str      = (const unsigned char *)argv[0];
+  const unsigned char *from_set = (const unsigned char *)argv[1];
+  const char          *to_set   = argv[2] != NULL ? argv[2] : "";
   char                 trans_tab[1 << CHAR_BIT];
   int                  i;
@@ -2559 +2559 @@
     trans_tab[i] = i;
 
-  while (   (i = *old_set) != '\0'
-         && (ch = *new_set) != '\0')
+  while (   (i = *from_set) != '\0'
+         && (ch = *to_set) != '\0')
     {
       trans_tab[i] = ch;
-      old_set++;
-      new_set++;
+      from_set++;
+      to_set++;
     }
 
@@ -2578 +2578 @@
             ch = ' ';
         }
-      while ((i = *old_set++) != '\0')
+      while ((i = *from_set++) != '\0')
         trans_tab[i] = ch;
     }