Changeset 24 for branches/FREEBSD/src/kmk/for.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/for.c (modified) (12 diffs)

branches/FREEBSD/src/kmk/for.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1993
- *      The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas.
+ * Copyright (c) 1992, The Regents of the University of California.
+ * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33 +30 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#)for.c    8.1 (Berkeley) 6/6/93
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/for.c,v 1.19 2002/10/09 03:42:10 jmallett Exp $");
+ */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)for.c       8.1 (Berkeley) 6/6/93";
+#else
+static const char rcsid[] =
+  "$FreeBSD: src/usr.bin/make/for.c,v 1.10 1999/09/11 13:08:01 hoek Exp $";
+#endif
+#endif /* not lint */
 
 /*-
@@ -84 +85 @@
 } For;
 
-static int ForExec(void *, void *);
+static int ForExec      __P((ClientData, ClientData));
 
 
@@ -108 +109 @@
  */
 int
-For_Eval (char *line)
+For_Eval (line)
+    char            *line;    /* Line to parse */
 {
     char            *ptr = line, *sub, *wrd;
@@ -176 +178 @@
         sub = Var_Subst(NULL, ptr, VAR_GLOBAL, FALSE);
 
-#define ADDWORD() \
+#define ADDWORD() \
         Buf_AddBytes(buf, ptr - wrd, (Byte *) wrd), \
         Buf_AddByte(buf, (Byte) '\0'), \
-        Lst_AtFront(forLst, (void *) Buf_GetAll(buf, &varlen)), \
+        Lst_AtFront(forLst, (ClientData) Buf_GetAll(buf, &varlen)), \
         Buf_Destroy(buf, FALSE)
 
@@ -193 +195 @@
                 wrd = ptr--;
             }
-        DEBUGF(FOR, ("For: Iterator %s List %s\n", forVar, sub));
+        if (DEBUG(FOR))
+            (void) fprintf(stderr, "For: Iterator %s List %s\n", forVar, sub);
         if (ptr - wrd > 0)
             ADDWORD();
         else
             Buf_Destroy(buf, TRUE);
-        free(sub);
+        free((Address) sub);
 
         forBuf = Buf_Init(0);
@@ -211 +214 @@
         if (strncmp(ptr, "endfor", 6) == 0 &&
             (isspace((unsigned char) ptr[6]) || !ptr[6])) {
-            DEBUGF(FOR, ("For: end for %d\n", forLevel));
+            if (DEBUG(FOR))
+                (void) fprintf(stderr, "For: end for %d\n", forLevel);
             if (--forLevel < 0) {
                 Parse_Error (level, "for-less endfor");
@@ -220 +224 @@
                  isspace((unsigned char) ptr[3])) {
             forLevel++;
-            DEBUGF(FOR, ("For: new loop %d\n", forLevel));
+            if (DEBUG(FOR))
+                (void) fprintf(stderr, "For: new loop %d\n", forLevel);
         }
     }
@@ -248 +253 @@
  */
 static int
-ForExec(void *namep, void *argp)
+ForExec(namep, argp)
+    ClientData namep;
+    ClientData argp;
 {
     char *name = (char *) namep;
@@ -254 +261 @@
     int len;
     Var_Set(arg->var, name, VAR_GLOBAL);
-    DEBUGF(FOR, ("--- %s = %s\n", arg->var, name));
+    if (DEBUG(FOR))
+        (void) fprintf(stderr, "--- %s = %s\n", arg->var, name);
     Parse_FromString(Var_Subst(arg->var, (char *) Buf_GetAll(arg->buf, &len),
                                VAR_GLOBAL, FALSE));
@@ -278 +286 @@
  */
 void
-For_Run(void)
+For_Run()
 {
     For arg;
@@ -291 +299 @@
     forLst = NULL;
 
-    Lst_ForEach(arg.lst, ForExec, (void *) &arg);
-
-    free(arg.var);
-    Lst_Destroy(arg.lst, (void (*)(void *)) free);
+    Lst_ForEach(arg.lst, ForExec, (ClientData) &arg);
+
+    free((Address)arg.var);
+    Lst_Destroy(arg.lst, (void (*) __P((ClientData))) free);
     Buf_Destroy(arg.buf, TRUE);
 }