Changeset 24 for branches/FREEBSD/src/kmk/var.c

Timestamp:

Nov 26, 2002, 10:24:54 PM (23 years ago)

Author:

bird

Message:

Import of RELENG_4_7_0_RELEASE

File:

• branches/FREEBSD/src/kmk/var.c (modified) (90 diffs)

branches/FREEBSD/src/kmk/var.c

@@ -35 +35 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#)var.c    8.3 (Berkeley) 3/19/94
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/var.c,v 1.35 2002/10/09 03:42:10 jmallett Exp $");
+ */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)var.c       8.3 (Berkeley) 3/19/94";
+#else
+static const char rcsid[] =
+  "$FreeBSD: src/usr.bin/make/var.c,v 1.16.2.3 2002/02/27 14:18:57 cjc Exp $";
+#endif
+#endif /* not lint */
 
 /*-
@@ -126 +130 @@
 static Lst      allVars;      /* List of all variables */
 
-#define FIND_CMD        0x1   /* look in VAR_CMD when searching */
-#define FIND_GLOBAL     0x2   /* look in VAR_GLOBAL as well */
-#define FIND_ENV        0x4   /* look in the environment also */
+#define FIND_CMD        0x1   /* look in VAR_CMD when searching */
+#define FIND_GLOBAL     0x2   /* look in VAR_GLOBAL as well */
+#define FIND_ENV        0x4   /* look in the environment also */
 
 typedef struct Var {
@@ -134 +138 @@
     Buffer        val;          /* its value */
     int           flags;        /* miscellaneous status flags */
-#define VAR_IN_USE      1           /* Variable's value currently being used.
+#define VAR_IN_USE      1           /* Variable's value currently being used.
                                      * Used to avoid recursion */
-#define VAR_FROM_ENV    2           /* Variable comes from the environment */
-#define VAR_JUNK        4           /* Variable is a junk variable that
+#define VAR_FROM_ENV    2           /* Variable comes from the environment */
+#define VAR_JUNK        4           /* Variable is a junk variable that
                                      * should be destroyed when done with
                                      * it. Used by Var_Parse for undefined,
@@ -144 +148 @@
 
 /* Var*Pattern flags */
-#define VAR_SUB_GLOBAL  0x01    /* Apply substitution globally */
-#define VAR_SUB_ONE     0x02    /* Apply substitution to one word */
-#define VAR_SUB_MATCHED 0x04    /* There was a match */
-#define VAR_MATCH_START 0x08    /* Match at start of word */
-#define VAR_MATCH_END   0x10    /* Match at end of word */
-#define VAR_NOSUBST     0x20    /* don't expand vars in VarGetPattern */
+#define VAR_SUB_GLOBAL  0x01    /* Apply substitution globally */
+#define VAR_SUB_ONE     0x02    /* Apply substitution to one word */
+#define VAR_SUB_MATCHED 0x04    /* There was a match */
+#define VAR_MATCH_START 0x08    /* Match at start of word */
+#define VAR_MATCH_END   0x10    /* Match at end of word */
+#define VAR_NOSUBST     0x20    /* don't expand vars in VarGetPattern */
 
 typedef struct {
@@ -167 +171 @@
 } VarREPattern;
 
-static int VarCmp(void *, void *);
-static void VarPossiblyExpand(char **, GNode *);
-static Var *VarFind(char *, GNode *, int);
-static void VarAdd(char *, char *, GNode *);
-static void VarDelete(void *);
-static Boolean VarHead(char *, Boolean, Buffer, void *);
-static Boolean VarTail(char *, Boolean, Buffer, void *);
-static Boolean VarSuffix(char *, Boolean, Buffer, void *);
-static Boolean VarRoot(char *, Boolean, Buffer, void *);
-static Boolean VarMatch(char *, Boolean, Buffer, void *);
+static int VarCmp __P((ClientData, ClientData));
+static Var *VarFind __P((char *, GNode *, int));
+static void VarAdd __P((char *, char *, GNode *));
+static void VarDelete __P((ClientData));
+static Boolean VarHead __P((char *, Boolean, Buffer, ClientData));
+static Boolean VarTail __P((char *, Boolean, Buffer, ClientData));
+static Boolean VarSuffix __P((char *, Boolean, Buffer, ClientData));
+static Boolean VarRoot __P((char *, Boolean, Buffer, ClientData));
+static Boolean VarMatch __P((char *, Boolean, Buffer, ClientData));
 #ifdef SYSVVARSUB
-static Boolean VarSYSVMatch(char *, Boolean, Buffer, void *);
+static Boolean VarSYSVMatch __P((char *, Boolean, Buffer, ClientData));
 #endif
-static Boolean VarNoMatch(char *, Boolean, Buffer, void *);
-static void VarREError(int, regex_t *, const char *);
-static Boolean VarRESubstitute(char *, Boolean, Buffer, void *);
-static Boolean VarSubstitute(char *, Boolean, Buffer, void *);
-static char *VarGetPattern(GNode *, int, char **, int, int *, int *, 
-                           VarPattern *);
-static char *VarQuote(char *);
-static char *VarModify(char *, Boolean (*)(char *, Boolean, Buffer, void *),
-                       void *);
-static int VarPrintVar(void *, void *);
+static Boolean VarNoMatch __P((char *, Boolean, Buffer, ClientData));
+static void VarREError __P((int, regex_t *, const char *));
+static Boolean VarRESubstitute __P((char *, Boolean, Buffer, ClientData));
+static Boolean VarSubstitute __P((char *, Boolean, Buffer, ClientData));
+static char *VarGetPattern __P((GNode *, int, char **, int, int *, int *,
+                                VarPattern *));
+static char *VarQuote __P((char *));
+static char *VarModify __P((char *, Boolean (*)(char *, Boolean, Buffer,
+                                                ClientData),
+                            ClientData));
+static int VarPrintVar __P((ClientData, ClientData));
 
 /*-
@@ -205 +209 @@
  */
 static int
-VarCmp (void *v, void *name)
+VarCmp (v, name)
+    ClientData     v;           /* VAR structure to compare */
+    ClientData     name;        /* name to look for */
 {
     return (strcmp ((char *) name, ((Var *) v)->name));
-}
-
-/*-
- *-----------------------------------------------------------------------
- * VarPossiblyExpand --
- *      Expand a variable name's embedded variables in the given context.
- *
- * Results:
- *      The contents of name, possibly expanded.
- *
- * Side Effects:
- *      The caller must free the new contents or old contents of name.
- *-----------------------------------------------------------------------
- */
-static void
-VarPossiblyExpand(char **name, GNode *ctxt)
-{
-    if (strchr(*name, '$') != NULL)
-        *name = Var_Subst(NULL, *name, ctxt, 0);
-    else
-        *name = estrdup(*name);
 }
 
@@ -237 +222 @@
  *      indicated.
  *
- *      Flags:
- *              FIND_GLOBAL     set means look in the VAR_GLOBAL context too
- *              FIND_CMD        set means to look in the VAR_CMD context too
- *              FIND_ENV        set means to look in the environment
- *
  * Results:
  *      A pointer to the structure describing the desired variable or
- *      NULL if the variable does not exist.
+ *      NIL if the variable does not exist.
  *
  * Side Effects:
@@ -251 +231 @@
  */
 static Var *
-VarFind (char *name, GNode *ctxt, int flags)
+VarFind (name, ctxt, flags)
+    char                *name;  /* name to find */
+    GNode               *ctxt;  /* context in which to find it */
+    int                 flags;  /* FIND_GLOBAL set means to look in the
+                                 * VAR_GLOBAL context as well.
+                                 * FIND_CMD set means to look in the VAR_CMD
+                                 * context also.
+                                 * FIND_ENV set means to look in the
+                                 * environment */
 {
     Boolean             localCheckEnvFirst;
@@ -297 +285 @@
      * the -E flag to use environment-variable-override for.
      */
-    if (Lst_Find (envFirstVars, (void *)name,
-                  (int (*)(void *, void *)) strcmp) != NULL)
+    if (Lst_Find (envFirstVars, (ClientData)name,
+                  (int (*)(ClientData, ClientData)) strcmp) != NILLNODE)
     {
         localCheckEnvFirst = TRUE;
@@ -310 +298 @@
      * depending on the FIND_* flags in 'flags'
      */
-    var = Lst_Find (ctxt->context, (void *)name, VarCmp);
-
-    if ((var == NULL) && (flags & FIND_CMD) && (ctxt != VAR_CMD)) {
-        var = Lst_Find (VAR_CMD->context, (void *)name, VarCmp);
-    }
-    if ((var == NULL) && (flags & FIND_GLOBAL) && (ctxt != VAR_GLOBAL) &&
+    var = Lst_Find (ctxt->context, (ClientData)name, VarCmp);
+
+    if ((var == NILLNODE) && (flags & FIND_CMD) && (ctxt != VAR_CMD)) {
+        var = Lst_Find (VAR_CMD->context, (ClientData)name, VarCmp);
+    }
+    if ((var == NILLNODE) && (flags & FIND_GLOBAL) && (ctxt != VAR_GLOBAL) &&
         !checkEnvFirst && !localCheckEnvFirst)
     {
-        var = Lst_Find (VAR_GLOBAL->context, (void *)name, VarCmp);
-    }
-    if ((var == NULL) && (flags & FIND_ENV)) {
+        var = Lst_Find (VAR_GLOBAL->context, (ClientData)name, VarCmp);
+    }
+    if ((var == NILLNODE) && (flags & FIND_ENV)) {
         char *env;
 
@@ -339 +327 @@
                    (flags & FIND_GLOBAL) && (ctxt != VAR_GLOBAL))
         {
-            var = Lst_Find (VAR_GLOBAL->context, (void *)name, VarCmp);
-            if (var == NULL) {
-                return ((Var *) NULL);
+            var = Lst_Find (VAR_GLOBAL->context, (ClientData)name, VarCmp);
+            if (var == NILLNODE) {
+                return ((Var *) NIL);
             } else {
                 return ((Var *)Lst_Datum(var));
             }
         } else {
-            return((Var *)NULL);
+            return((Var *)NIL);
         }
-    } else if (var == NULL) {
-        return ((Var *) NULL);
+    } else if (var == NILLNODE) {
+        return ((Var *) NIL);
     } else {
         return ((Var *) Lst_Datum (var));
@@ -358 +346 @@
  *-----------------------------------------------------------------------
  * VarAdd  --
- *      Add a new variable of name name and value val to the given context.
+ *      Add a new variable of name name and value val to the given context
  *
  * Results:
@@ -370 +358 @@
  */
 static void
-VarAdd (char *name, char *val, GNode *ctxt)
-{
-    Var           *v;
+VarAdd (name, val, ctxt)
+    char           *name;       /* name of variable to add */
+    char           *val;        /* value to set it to */
+    GNode          *ctxt;       /* context in which to set it */
+{
+    register Var   *v;
     int           len;
 
@@ -385 +376 @@
     v->flags = 0;
 
-    (void) Lst_AtFront (ctxt->context, (void *)v);
-    (void) Lst_AtEnd (allVars, (void *) v);
-    DEBUGF(VAR, ("%s:%s = %s\n", ctxt->name, name, val));
+    (void) Lst_AtFront (ctxt->context, (ClientData)v);
+    (void) Lst_AtEnd (allVars, (ClientData) v);
+    if (DEBUG(VAR)) {
+        printf("%s:%s = %s\n", ctxt->name, name, val);
+    }
 }
 
@@ -404 +397 @@
  */
 static void
-VarDelete(void *vp)
+VarDelete(vp)
+    ClientData vp;
 {
     Var *v = (Var *) vp;
     free(v->name);
     Buf_Destroy(v->val, TRUE);
-    free(v);
+    free((Address) v);
 }
 
@@ -428 +422 @@
  */
 void
-Var_Delete(char *name, GNode *ctxt)
+Var_Delete(name, ctxt)
+    char          *name;
+    GNode         *ctxt;
 {
     LstNode       ln;
 
-    DEBUGF(VAR, ("%s:delete %s\n", ctxt->name, name));
-    ln = Lst_Find(ctxt->context, (void *)name, VarCmp);
-    if (ln != NULL) {
-        Var       *v;
+    if (DEBUG(VAR)) {
+        printf("%s:delete %s\n", ctxt->name, name);
+    }
+    ln = Lst_Find(ctxt->context, (ClientData)name, VarCmp);
+    if (ln != NILLNODE) {
+        register Var      *v;
 
         v = (Var *)Lst_Datum(ln);
@@ -441 +439 @@
         ln = Lst_Member(allVars, v);
         Lst_Remove(allVars, ln);
-        VarDelete((void *) v);
+        VarDelete((ClientData) v);
     }
 }
@@ -467 +465 @@
  */
 void
-Var_Set (char *name, char *val, GNode *ctxt)
-{
-    Var            *v;
+Var_Set (name, val, ctxt)
+    char           *name;       /* name of variable to set */
+    char           *val;        /* value to give to the variable */
+    GNode          *ctxt;       /* context in which to set it */
+{
+    register Var   *v;
 
     /*
@@ -476 +477 @@
      * point in searching them all just to save a bit of memory...
      */
-    VarPossiblyExpand(&name, ctxt);
     v = VarFind (name, ctxt, 0);
-    if (v == (Var *) NULL) {
+    if (v == (Var *) NIL) {
         VarAdd (name, val, ctxt);
     } else {
@@ -484 +484 @@
         Buf_AddBytes(v->val, strlen(val), (Byte *)val);
 
-        DEBUGF(VAR, ("%s:%s = %s\n", ctxt->name, name, val));
+        if (DEBUG(VAR)) {
+            printf("%s:%s = %s\n", ctxt->name, name, val);
+        }
     }
     /*
@@ -493 +495 @@
         setenv(name, val, 1);
     }
-    free(name);
 }
 
@@ -519 +520 @@
  */
 void
-Var_Append (char *name, char *val, GNode *ctxt)
-{
-    Var            *v;
-
-    VarPossiblyExpand(&name, ctxt);
+Var_Append (name, val, ctxt)
+    char           *name;       /* Name of variable to modify */
+    char           *val;        /* String to append to it */
+    GNode          *ctxt;       /* Context in which this should occur */
+{
+    register Var   *v;
+
     v = VarFind (name, ctxt, (ctxt == VAR_GLOBAL) ? FIND_ENV : 0);
 
-    if (v == (Var *) NULL) {
+    if (v == (Var *) NIL) {
         VarAdd (name, val, ctxt);
     } else {
@@ -532 +535 @@
         Buf_AddBytes(v->val, strlen(val), (Byte *)val);
 
-        DEBUGF(VAR, ("%s:%s = %s\n", ctxt->name, name, 
-               (char *) Buf_GetAll(v->val, (int *)NULL)));
+        if (DEBUG(VAR)) {
+            printf("%s:%s = %s\n", ctxt->name, name,
+                   (char *) Buf_GetAll(v->val, (int *)NULL));
+        }
 
         if (v->flags & VAR_FROM_ENV) {
@@ -543 +548 @@
              */
             v->flags &= ~VAR_FROM_ENV;
-            Lst_AtFront(ctxt->context, (void *)v);
+            Lst_AtFront(ctxt->context, (ClientData)v);
         }
     }
-    free(name);
 }
 
@@ -563 +567 @@
  */
 Boolean
-Var_Exists(char *name, GNode *ctxt)
+Var_Exists(name, ctxt)
+    char          *name;        /* Variable to find */
+    GNode         *ctxt;        /* Context in which to start search */
 {
     Var           *v;
 
-    VarPossiblyExpand(&name, ctxt);
     v = VarFind(name, ctxt, FIND_CMD|FIND_GLOBAL|FIND_ENV);
-    free(name);
-
-    if (v == (Var *)NULL) {
+
+    if (v == (Var *)NIL) {
         return(FALSE);
     } else if (v->flags & VAR_FROM_ENV) {
@@ -594 +598 @@
  */
 char *
-Var_Value (char *name, GNode *ctxt, char **frp)
+Var_Value (name, ctxt, frp)
+    char           *name;       /* name to find */
+    GNode          *ctxt;       /* context in which to search for it */
+    char           **frp;
 {
     Var            *v;
 
-    VarPossiblyExpand(&name, ctxt);
     v = VarFind (name, ctxt, FIND_ENV | FIND_GLOBAL | FIND_CMD);
-    free(name);
     *frp = NULL;
-    if (v != (Var *) NULL) {
+    if (v != (Var *) NIL) {
         char *p = ((char *)Buf_GetAll(v->val, (int *)NULL));
         if (v->flags & VAR_FROM_ENV) {
             Buf_Destroy(v->val, FALSE);
-            free(v);
+            free((Address) v);
             *frp = p;
         }
@@ -631 +636 @@
  */
 static Boolean
-VarHead (char *word, Boolean addSpace, Buffer buf, void *dummy __unused)
-{
-    char *slash;
+VarHead (word, addSpace, buf, dummy)
+    char          *word;        /* Word to trim */
+    Boolean       addSpace;     /* True if need to add a space to the buffer
+                                 * before sticking in the head */
+    Buffer        buf;          /* Buffer in which to store it */
+    ClientData    dummy;
+{
+    register char *slash;
 
     slash = strrchr (word, '/');
@@ -654 +664 @@
         }
     }
-    return (TRUE);
+    return(dummy ? TRUE : TRUE);
 }
 
@@ -673 +683 @@
  */
 static Boolean
-VarTail (char *word, Boolean addSpace, Buffer buf, void *dummy __unused)
-{
-    char *slash;
+VarTail (word, addSpace, buf, dummy)
+    char          *word;        /* Word to trim */
+    Boolean       addSpace;     /* TRUE if need to stick a space in the
+                                 * buffer before adding the tail */
+    Buffer        buf;          /* Buffer in which to store it */
+    ClientData    dummy;
+{
+    register char *slash;
 
     if (addSpace) {
@@ -689 +704 @@
         Buf_AddBytes (buf, strlen(word), (Byte *)word);
     }
-    return (TRUE);
+    return (dummy ? TRUE : TRUE);
 }
 
@@ -707 +722 @@
  */
 static Boolean
-VarSuffix (char *word, Boolean addSpace, Buffer buf, void *dummy __unused)
-{
-    char *dot;
+VarSuffix (word, addSpace, buf, dummy)
+    char          *word;        /* Word to trim */
+    Boolean       addSpace;     /* TRUE if need to add a space before placing
+                                 * the suffix in the buffer */
+    Buffer        buf;          /* Buffer in which to store it */
+    ClientData    dummy;
+{
+    register char *dot;
 
     dot = strrchr (word, '.');
@@ -721 +741 @@
         addSpace = TRUE;
     }
-    return (addSpace);
+    return (dummy ? addSpace : addSpace);
 }
 
@@ -740 +760 @@
  */
 static Boolean
-VarRoot (char *word, Boolean addSpace, Buffer buf, void *dummy __unused)
-{
-    char *dot;
+VarRoot (word, addSpace, buf, dummy)
+    char          *word;        /* Word to trim */
+    Boolean       addSpace;     /* TRUE if need to add a space to the buffer
+                                 * before placing the root in it */
+    Buffer        buf;          /* Buffer in which to store it */
+    ClientData    dummy;
+{
+    register char *dot;
 
     if (addSpace) {
@@ -756 +781 @@
         Buf_AddBytes (buf, strlen(word), (Byte *)word);
     }
-    return (TRUE);
+    return (dummy ? TRUE : TRUE);
 }
 
@@ -764 +789 @@
  *      Place the word in the buffer if it matches the given pattern.
  *      Callback function for VarModify to implement the :M modifier.
- *      A space will be added if requested.  A pattern is supplied
- *      which the word must match.
  *
  * Results:
@@ -777 +800 @@
  */
 static Boolean
-VarMatch (char *word, Boolean addSpace, Buffer buf, void *pattern)
+VarMatch (word, addSpace, buf, pattern)
+    char          *word;        /* Word to examine */
+    Boolean       addSpace;     /* TRUE if need to add a space to the
+                                 * buffer before adding the word, if it
+                                 * matches */
+    Buffer        buf;          /* Buffer in which to store it */
+    ClientData    pattern;      /* Pattern the word must match */
 {
     if (Str_Match(word, (char *) pattern)) {
@@ -795 +824 @@
  *      Place the word in the buffer if it matches the given pattern.
  *      Callback function for VarModify to implement the System V %
- *      modifiers.  A space is added if requested.
+ *      modifiers.
  *
  * Results:
@@ -807 +836 @@
  */
 static Boolean
-VarSYSVMatch (char *word, Boolean addSpace, Buffer buf, void *patp)
+VarSYSVMatch (word, addSpace, buf, patp)
+    char          *word;        /* Word to examine */
+    Boolean       addSpace;     /* TRUE if need to add a space to the
+                                 * buffer before adding the word, if it
+                                 * matches */
+    Buffer        buf;          /* Buffer in which to store it */
+    ClientData    patp;         /* Pattern the word must match */
 {
     int len;
@@ -832 +867 @@
  * VarNoMatch --
  *      Place the word in the buffer if it doesn't match the given pattern.
- *      Callback function for VarModify to implement the :N modifier.  A
- *      space is added if requested.
+ *      Callback function for VarModify to implement the :N modifier.
  *
  * Results:
@@ -845 +879 @@
  */
 static Boolean
-VarNoMatch (char *word, Boolean addSpace, Buffer buf, void *pattern)
+VarNoMatch (word, addSpace, buf, pattern)
+    char          *word;        /* Word to examine */
+    Boolean       addSpace;     /* TRUE if need to add a space to the
+                                 * buffer before adding the word, if it
+                                 * matches */
+    Buffer        buf;          /* Buffer in which to store it */
+    ClientData    pattern;      /* Pattern the word must match */
 {
     if (!Str_Match(word, (char *) pattern)) {
@@ -862 +902 @@
  * VarSubstitute --
  *      Perform a string-substitution on the given word, placing the
- *      result in the passed buffer.  A space is added if requested.
+ *      result in the passed buffer.
  *
  * Results:
@@ -873 +913 @@
  */
 static Boolean
-VarSubstitute (char *word, Boolean addSpace, Buffer buf, void *patternp)
-{
-    int                 wordLen;    /* Length of word */
-    char                *cp;        /* General pointer */
+VarSubstitute (word, addSpace, buf, patternp)
+    char                *word;      /* Word to modify */
+    Boolean             addSpace;   /* True if space should be added before
+                                     * other characters */
+    Buffer              buf;        /* Buffer for result */
+    ClientData          patternp;   /* Pattern for substitution */
+{
+    register int        wordLen;    /* Length of word */
+    register char       *cp;        /* General pointer */
     VarPattern  *pattern = (VarPattern *) patternp;
 
@@ -971 +1016 @@
              * buffer.
              */
-            Boolean done;
+            register Boolean done;
             int origSize;
 
@@ -1035 +1080 @@
  */
 static void
-VarREError(int err, regex_t *pat, const char *str)
+VarREError(err, pat, str)
+    int err;
+    regex_t *pat;
+    const char *str;
 {
     char *errbuf;
@@ -1052 +1100 @@
  * VarRESubstitute --
  *      Perform a regex substitution on the given word, placing the
- *      result in the passed buffer.  A space is added if requested.
+ *      result in the passed buffer.
  *
  * Results:
@@ -1063 +1111 @@
  */
 static Boolean
-VarRESubstitute(char *word, Boolean addSpace, Buffer buf, void *patternp)
+VarRESubstitute(word, addSpace, buf, patternp)
+    char *word;
+    Boolean addSpace;
+    Buffer buf;
+    ClientData patternp;
 {
     VarREPattern *pat;
@@ -1072 +1124 @@
     int flags = 0;
 
-#define MAYBE_ADD_SPACE()               \
+#define MAYBE_ADD_SPACE()               \
         if (addSpace && !added)         \
             Buf_AddByte(buf, ' ');      \
@@ -1191 +1243 @@
  */
 static char *
-VarModify (char *str, Boolean (*modProc)(char *, Boolean, Buffer, void *),
-    void *datum)
+VarModify (str, modProc, datum)
+    char          *str;             /* String whose words should be trimmed */
+                                    /* Function to use to modify them */
+    Boolean       (*modProc) __P((char *, Boolean, Buffer, ClientData));
+    ClientData    datum;            /* Datum to pass it */
 {
     Buffer        buf;              /* Buffer for the new string */
@@ -1238 +1293 @@
  */
 static char *
-VarGetPattern(GNode *ctxt, int err, char **tstr, int delim, int *flags,
-    int *length, VarPattern *pattern)
+VarGetPattern(ctxt, err, tstr, delim, flags, length, pattern)
+    GNode *ctxt;
+    int err;
+    char **tstr;
+    int delim;
+    int *flags;
+    int *length;
+    VarPattern *pattern;
 {
     char *cp;
@@ -1247 +1308 @@
         length = &junk;
 
-#define IS_A_MATCH(cp, delim) \
+#define IS_A_MATCH(cp, delim) \
     ((cp[0] == '\\') && ((cp[1] == delim) ||  \
      (cp[1] == '\\') || (cp[1] == '$') || (pattern && (cp[1] == '&'))))
@@ -1352 +1413 @@
  */
 static char *
-VarQuote(char *str)
+VarQuote(str)
+        char *str;
 {
 
@@ -1392 +1454 @@
  */
 char *
-Var_Parse(char *str, GNode *ctxt, Boolean err, int *lengthPtr, Boolean *freePtr)
-{
-    char            *tstr;      /* Pointer into str */
+Var_Parse (str, ctxt, err, lengthPtr, freePtr)
+    char          *str;         /* The string to parse */
+    GNode         *ctxt;        /* The context for the variable */
+    Boolean         err;        /* TRUE if undefined variables are an error */
+    int             *lengthPtr; /* OUT: The length of the specification */
+    Boolean         *freePtr;   /* OUT: TRUE if caller should free result */
+{
+    register char   *tstr;      /* Pointer into str */
     Var             *v;         /* Variable in invocation */
     char            *cp;        /* Secondary pointer into str (place marker
                                  * for tstr) */
     Boolean         haveModifier;/* TRUE if have modifiers for the variable */
-    char            endc;       /* Ending character when variable in parens
+    register char   endc;       /* Ending character when variable in parens
                                  * or braces */
-    char            startc=0;   /* Starting character when variable in parens
+    register char   startc=0;   /* Starting character when variable in parens
                                  * or braces */
     int             cnt;        /* Used to count brace pairs when variable in
@@ -1430 +1497 @@
 
         v = VarFind (name, ctxt, FIND_ENV | FIND_GLOBAL | FIND_CMD);
-        if (v == (Var *)NULL) {
+        if (v == (Var *)NIL) {
             *lengthPtr = 2;
 
@@ -1453 +1520 @@
                     case '!':
                         return("$(.MEMBER)");
-                    default:
-                        break;
                 }
             }
@@ -1512 +1577 @@
 
         v = VarFind (str, ctxt, FIND_ENV | FIND_GLOBAL | FIND_CMD);
-        if ((v == (Var *)NULL) && (ctxt != VAR_CMD) && (ctxt != VAR_GLOBAL) &&
+        if ((v == (Var *)NIL) && (ctxt != VAR_CMD) && (ctxt != VAR_GLOBAL) &&
             (vlen == 2) && (str[1] == 'F' || str[1] == 'D'))
         {
@@ -1537 +1602 @@
                     v = VarFind(vname, ctxt, 0);
 
-                    if (v != (Var *)NULL && !haveModifier) {
+                    if (v != (Var *)NIL && !haveModifier) {
                         /*
                          * No need for nested expansion or anything, as we're
@@ -1546 +1611 @@
 
                         if (str[1] == 'D') {
-                            val = VarModify(val, VarHead, (void *)0);
+                            val = VarModify(val, VarHead, (ClientData)0);
                         } else {
-                            val = VarModify(val, VarTail, (void *)0);
+                            val = VarModify(val, VarTail, (ClientData)0);
                         }
                         /*
@@ -1561 +1626 @@
                     }
                     break;
-                default:
-                    break;
                 }
             }
         }
 
-        if (v == (Var *)NULL) {
+        if (v == (Var *)NIL) {
             if (((vlen == 1) ||
                  (((vlen == 2) && (str[1] == 'F' ||
@@ -1588 +1651 @@
                     case '!':
                         dynamic = TRUE;
-                        break;
-                    default:
                         break;
                 }
@@ -1693 +1754 @@
             char        termc;      /* Character which terminated scan */
 
-            DEBUGF(VAR, ("Applying :%c to \"%s\"\n", *tstr, str));
+            if (DEBUG(VAR)) {
+                printf("Applying :%c to \"%s\"\n", *tstr, str);
+            }
             switch (*tstr) {
                 case 'U':
@@ -1770 +1833 @@
                     }
                     if (*tstr == 'M' || *tstr == 'm') {
-                        newStr = VarModify(str, VarMatch, (void *)pattern);
+                        newStr = VarModify(str, VarMatch, (ClientData)pattern);
                     } else {
                         newStr = VarModify(str, VarNoMatch,
-                                           (void *)pattern);
+                                           (ClientData)pattern);
                     }
                     if (copy) {
@@ -1783 +1846 @@
                 {
                     VarPattern      pattern;
-                    char            del;
+                    register char   delim;
                     Buffer          buf;        /* Buffer for patterns */
 
                     pattern.flags = 0;
-                    del = tstr[1];
+                    delim = tstr[1];
                     tstr += 2;
 
@@ -1808 +1871 @@
                      * The result is left in the Buffer buf.
                      */
-                    for (cp = tstr; *cp != '\0' && *cp != del; cp++) {
+                    for (cp = tstr; *cp != '\0' && *cp != delim; cp++) {
                         if ((*cp == '\\') &&
-                            ((cp[1] == del) ||
+                            ((cp[1] == delim) ||
                              (cp[1] == '$') ||
                              (cp[1] == '\\')))
@@ -1817 +1880 @@
                             cp++;
                         } else if (*cp == '$') {
-                            if (cp[1] != del) {
+                            if (cp[1] != delim) {
                                 /*
                                  * If unescaped dollar sign not before the
@@ -1851 +1914 @@
                      * return NULL
                      */
-                    if (*cp != del) {
+                    if (*cp != delim) {
                         *lengthPtr = cp - start + 1;
                         if (*freePtr) {
@@ -1858 +1921 @@
                         Buf_Destroy(buf, TRUE);
                         Error("Unclosed substitution for %s (%c missing)",
-                              v->name, del);
+                              v->name, delim);
                         return (var_Error);
                     }
@@ -1883 +1946 @@
 
                     tstr = cp + 1;
-                    for (cp = tstr; *cp != '\0' && *cp != del; cp++) {
+                    for (cp = tstr; *cp != '\0' && *cp != delim; cp++) {
                         if ((*cp == '\\') &&
-                            ((cp[1] == del) ||
+                            ((cp[1] == delim) ||
                              (cp[1] == '&') ||
                              (cp[1] == '\\') ||
@@ -1892 +1955 @@
                             Buf_AddByte(buf, (Byte)cp[1]);
                             cp++;
-                        } else if ((*cp == '$') && (cp[1] != del)) {
+                        } else if ((*cp == '$') && (cp[1] != delim)) {
                             char    *cp2;
                             int     len;
@@ -1916 +1979 @@
                      * If didn't end in delimiter character, complain
                      */
-                    if (*cp != del) {
+                    if (*cp != delim) {
                         *lengthPtr = cp - start + 1;
                         if (*freePtr) {
@@ -1923 +1986 @@
                         Buf_Destroy(buf, TRUE);
                         Error("Unclosed substitution for %s (%c missing)",
-                              v->name, del);
+                              v->name, delim);
                         return (var_Error);
                     }
@@ -1944 +2007 @@
                     termc = *cp;
                     newStr = VarModify(str, VarSubstitute,
-                                       (void *)&pattern);
+                                       (ClientData)&pattern);
                     /*
                      * Free the two strings.
@@ -1998 +2061 @@
                             pattern.flags |= VAR_SUB_ONE;
                             continue;
-                        default:
-                            break;
                         }
                         break;
@@ -2023 +2084 @@
                                               sizeof(regmatch_t));
                     newStr = VarModify(str, VarRESubstitute,
-                                       (void *) &pattern);
+                                       (ClientData) &pattern);
                     regfree(&pattern.re);
                     free(pattern.replace);
@@ -2039 +2100 @@
                 case 'T':
                     if (tstr[1] == endc || tstr[1] == ':') {
-                        newStr = VarModify (str, VarTail, (void *)0);
+                        newStr = VarModify (str, VarTail, (ClientData)0);
                         cp = tstr + 1;
                         termc = *cp;
@@ -2047 +2108 @@
                 case 'H':
                     if (tstr[1] == endc || tstr[1] == ':') {
-                        newStr = VarModify (str, VarHead, (void *)0);
+                        newStr = VarModify (str, VarHead, (ClientData)0);
                         cp = tstr + 1;
                         termc = *cp;
@@ -2055 +2116 @@
                 case 'E':
                     if (tstr[1] == endc || tstr[1] == ':') {
-                        newStr = VarModify (str, VarSuffix, (void *)0);
+                        newStr = VarModify (str, VarSuffix, (ClientData)0);
                         cp = tstr + 1;
                         termc = *cp;
@@ -2063 +2124 @@
                 case 'R':
                     if (tstr[1] == endc || tstr[1] == ':') {
-                        newStr = VarModify (str, VarRoot, (void *)0);
+                        newStr = VarModify (str, VarRoot, (ClientData)0);
                         cp = tstr + 1;
                         termc = *cp;
@@ -2072 +2133 @@
                 case 's':
                     if (tstr[1] == 'h' && (tstr[2] == endc || tstr[2] == ':')) {
-                        char *error;
-                        newStr = Cmd_Exec (str, &error);
-                        if (error)
-                            Error (error, str);
+                        char *err;
+                        newStr = Cmd_Exec (str, &err);
+                        if (err)
+                            Error (err, str);
                         cp = tstr + 2;
                         termc = *cp;
@@ -2143 +2204 @@
                          */
                         newStr = VarModify(str, VarSYSVMatch,
-                                           (void *)&pattern);
+                                           (ClientData)&pattern);
 
                         /*
@@ -2164 +2225 @@
                 }
             }
-            DEBUGF(VAR, ("Result is \"%s\"\n", newStr));
+            if (DEBUG(VAR)) {
+                printf("Result is \"%s\"\n", newStr);
+            }
 
             if (*freePtr) {
@@ -2203 +2266 @@
         }
         Buf_Destroy(v->val, destroy);
-        free(v);
+        free((Address)v);
     } else if (v->flags & VAR_JUNK) {
         /*
@@ -2214 +2277 @@
         *freePtr = FALSE;
         Buf_Destroy(v->val, TRUE);
-        free(v);
+        free((Address)v);
         if (dynamic) {
             str = emalloc(*lengthPtr + 1);
@@ -2242 +2305 @@
  */
 char *
-Var_Subst (char *var, char *str, GNode *ctxt, Boolean undefErr)
+Var_Subst (var, str, ctxt, undefErr)
+    char          *var;             /* Named variable || NULL for all */
+    char          *str;             /* the string in which to substitute */
+    GNode         *ctxt;            /* the context wherein to find variables */
+    Boolean       undefErr;         /* TRUE if undefineds are an error */
 {
     Buffer        buf;              /* Buffer for forming things */
@@ -2377 +2444 @@
                 Buf_AddBytes (buf, strlen (val), (Byte *)val);
                 if (doFree) {
-                    free (val);
+                    free ((Address)val);
                 }
             }
@@ -2404 +2471 @@
  */
 char *
-Var_GetTail(char *file)
-{
-    return(VarModify(file, VarTail, (void *)0));
+Var_GetTail(file)
+    char        *file;      /* Filename to modify */
+{
+    return(VarModify(file, VarTail, (ClientData)0));
 }
 
@@ -2425 +2493 @@
  */
 char *
-Var_GetHead(char *file)
-{
-    return(VarModify(file, VarHead, (void *)0));
+Var_GetHead(file)
+    char        *file;      /* Filename to manipulate */
+{
+    return(VarModify(file, VarHead, (ClientData)0));
 }
 
@@ -2443 +2512 @@
  */
 void
-Var_Init (void)
+Var_Init ()
 {
     VAR_GLOBAL = Targ_NewGN ("Global");
@@ -2453 +2522 @@
 
 void
-Var_End (void)
+Var_End ()
 {
     Lst_Destroy(allVars, VarDelete);
@@ -2461 +2530 @@
 /****************** PRINT DEBUGGING INFO *****************/
 static int
-VarPrintVar (void *vp, void *dummy __unused)
+VarPrintVar (vp, dummy)
+    ClientData vp;
+    ClientData dummy;
 {
     Var    *v = (Var *) vp;
     printf ("%-16s = %s\n", v->name, (char *) Buf_GetAll(v->val, (int *)NULL));
-    return (0);
+    return (dummy ? 0 : 0);
 }
 
@@ -2475 +2546 @@
  */
 void
-Var_Dump (GNode *ctxt)
-{
-    Lst_ForEach (ctxt->context, VarPrintVar, (void *) 0);
-}
+Var_Dump (ctxt)
+    GNode          *ctxt;
+{
+    Lst_ForEach (ctxt->context, VarPrintVar, (ClientData) 0);
+}