Changeset 153 in kBuild for branches/GNU/src/gmake/read.c

Timestamp:

Sep 8, 2004 2:43:30 AM (20 years ago)

Author:

bird

Message:

GNU Make 3.81beta1.

File:

• branches/GNU/src/gmake/read.c (modified) (6 diffs)

branches/GNU/src/gmake/read.c

@@ -138 +138 @@
                         const struct floc *flocp, int set_default));
 static void record_target_var PARAMS ((struct nameseq *filenames, char *defn,
-                                       int two_colon,
                                        enum variable_origin origin,
                                        int enabled,
@@ -510 +509 @@
   while (1)
     {
-      int linelen;
+      unsigned int linelen;
       char *line;
       int len;
@@ -1058 +1057 @@
         exported = 0;
         if (wtype == w_static)
-          if (word1eq ("override"))
-            {
-              v_origin = o_override;
-              wtype = get_next_mword (p+len, NULL, &p, &len);
-            }
-          else if (word1eq ("export"))
-            {
-              exported = 1;
-              wtype = get_next_mword (p+len, NULL, &p, &len);
-            }
+          {
+            if (word1eq ("override"))
+              {
+                v_origin = o_override;
+                wtype = get_next_mword (p+len, NULL, &p, &len);
+              }
+            else if (word1eq ("export"))
+              {
+                exported = 1;
+                wtype = get_next_mword (p+len, NULL, &p, &len);
+              }
+          }
 
         if (wtype != w_eol)
@@ -1084 +1085 @@
                 p = variable_buffer + l;
               }
-            record_target_var (filenames, p, two_colon, v_origin, exported,
-                               fstart);
+            record_target_var (filenames, p, v_origin, exported, fstart);
             filenames = 0;
             continue;
@@ -1464 +1464 @@
       char *var;
       struct variable *v;
-      register char *p = end_of_token (line);
-      i = p - line;
+      register char *p;
+
+      /* Expand the thing we're looking up, so we can use indirect and
+         constructed variable names.  */
+      var = allocated_variable_expand (line);
+
+      /* Make sure there's only one variable name to test.  */
+      p = end_of_token (var);
+      i = p - var;
       p = next_token (p);
       if (*p != '\0')
         return -1;
 
-      /* Expand the thing we're looking up, so we can use indirect and
-         constructed variable names.  */
-      line[i] = '\0';
-      var = allocated_variable_expand (line);
-
+      var[i] = '\0';
       v = lookup_variable (var, strlen (var));
       conditionals->ignoring[conditionals->if_cmds - 1]
@@ -1660 +1663 @@
 
 static void
-record_target_var (struct nameseq *filenames, char *defn, int two_colon,
+record_target_var (struct nameseq *filenames, char *defn,
                    enum variable_origin origin, int exported,
                    const struct floc *flocp)