Changeset 2596 for vendor/gnumake/current/rule.c

Timestamp:

Jun 20, 2012, 12:44:52 AM (13 years ago)

Author:

bird

Message:

gnumake/current -> 3.82-cvs.

Location:

vendor/gnumake/current

Files:

• . (modified) (1 prop)
• rule.c (modified) (8 diffs)

vendor/gnumake/current/rule.c

@@ -1 +1 @@
 /* Pattern and suffix rule internals for GNU Make.
 Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
-Foundation, Inc.
+1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+2010 Free Software Foundation, Inc.
 This file is part of GNU Make.
 
@@ -97 +97 @@
       for (dep = rule->deps; dep != 0; dep = dep->next)
         {
-          unsigned int len = strlen (dep->name);
+          const char *dname = dep_name (dep);
+          unsigned int len = strlen (dname);
 
 #ifdef VMS
-          const char *p = strrchr (dep->name, ']');
+          const char *p = strrchr (dname, ']');
           const char *p2;
           if (p == 0)
-            p = strrchr (dep->name, ':');
-          p2 = p != 0 ? strchr (dep->name, '%') : 0;
+            p = strrchr (dname, ':');
+          p2 = p != 0 ? strchr (dname, '%') : 0;
 #else
-          const char *p = strrchr (dep->name, '/');
-          const char *p2 = p != 0 ? strchr (dep->name, '%') : 0;
+          const char *p = strrchr (dname, '/');
+          const char *p2 = p != 0 ? strchr (dname, '%') : 0;
 #endif
-          ndeps++;
+          ndeps++;
 
           if (len > max_pattern_dep_length)
@@ -118 +119 @@
               /* There is a slash before the % in the dep name.
                  Extract the directory name.  */
-              if (p == dep->name)
+              if (p == dname)
                 ++p;
-              if (p - dep->name > namelen)
+              if (p - dname > namelen)
                 {
-                  namelen = p - dep->name;
+                  namelen = p - dname;
                   name = xrealloc (name, namelen + 1);
                 }
-              memcpy (name, dep->name, p - dep->name);
-              name[p - dep->name] = '\0';
+              memcpy (name, dname, p - dname);
+              name[p - dname] = '\0';
 
               /* In the deps of an implicit rule the `changed' flag
@@ -380 +381 @@
 
   ptr = p->dep;
-  r->deps = (struct dep *) multi_glob (parse_file_seq (&ptr, '\0',
-                                                       sizeof (struct dep), 1),
-                                       sizeof (struct dep));
+  r->deps = PARSE_FILE_SEQ (&ptr, struct dep, '\0', NULL, 0);
 
   if (new_pattern_rule (r, 0))
@@ -406 +405 @@
 {
   struct rule *next = rule->next;
-  struct dep *dep;
-
-  dep = rule->deps;
-  while (dep)
-    {
-      struct dep *t = dep->next;
-      free_dep (dep);
-      dep = t;
-    }
-
-  free (rule->targets);
-  free (rule->suffixes);
+
+  free_dep_chain (rule->deps);
+
+  /* MSVC erroneously warns without a cast here.  */
+  free ((void *)rule->targets);
+  free ((void *)rule->suffixes);
   free (rule->lens);
 
@@ -488 +481 @@
 {
   unsigned int i;
-  struct dep *d;
 
   for (i = 0; i < r->num; ++i)
@@ -498 +490 @@
     putchar (':');
 
-  for (d = r->deps; d != 0; d = d->next)
-    printf (" %s", dep_name (d));
-  putchar ('\n');
+  print_prereqs (r->deps);
 
   if (r->cmds != 0)
@@ -547 +537 @@
          makefiles and thus count_implicit_rule_limits wasn't called yet.  */
       if (num_pattern_rules != 0)
-        fatal (NILF, _("BUG: num_pattern_rules wrong!  %u != %u"),
+        fatal (NILF, _("BUG: num_pattern_rules is wrong!  %u != %u"),
                num_pattern_rules, rules);
     }