[src/trunk]: src/usr.bin/make Some minor cleanup of :: tests.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/usr.bin/make Some minor cleanup of :: tests.
From: mycroft <mycroft%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 06:13:48 +0000

details:   https://anonhg.NetBSD.org/src/rev/b11a178d82bf
branches:  trunk
changeset: 476413:b11a178d82bf
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Thu Sep 16 00:54:14 1999 +0000

description:
Some minor cleanup of :: tests.

diffstat:

 usr.bin/make/make.c  |   8 ++++----
 usr.bin/make/parse.c |  10 +++++-----
 usr.bin/make/suff.c  |   8 ++++----
 usr.bin/make/targ.c  |  10 +++++-----
 4 files changed, 18 insertions(+), 18 deletions(-)

diffs (158 lines):

diff -r 4c39de6ea546 -r b11a178d82bf usr.bin/make/make.c
--- a/usr.bin/make/make.c       Thu Sep 16 00:49:48 1999 +0000
+++ b/usr.bin/make/make.c       Thu Sep 16 00:54:14 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: make.c,v 1.23 1999/09/15 10:47:38 mycroft Exp $        */
+/*     $NetBSD: make.c,v 1.24 1999/09/16 00:54:14 mycroft Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -39,14 +39,14 @@
  */
 
 #ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: make.c,v 1.23 1999/09/15 10:47:38 mycroft Exp $";
+static char rcsid[] = "$NetBSD: make.c,v 1.24 1999/09/16 00:54:14 mycroft Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)make.c     8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: make.c,v 1.23 1999/09/15 10:47:38 mycroft Exp $");
+__RCSID("$NetBSD: make.c,v 1.24 1999/09/16 00:54:14 mycroft Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -934,7 +934,7 @@
     while (!Lst_IsEmpty (examine)) {
        gn = (GNode *) Lst_DeQueue (examine);
 
-       if ((gn->type & OP_OPMASK) == OP_DOUBLEDEP) {
+       if ((gn->type & OP_DOUBLEDEP) && !Lst_IsEmpty (gn->cohorts)) {
            Lst new;
            new = Lst_Duplicate (gn->cohorts, NOCOPY);
            Lst_Concat (new, examine, LST_CONCLINK);
diff -r 4c39de6ea546 -r b11a178d82bf usr.bin/make/parse.c
--- a/usr.bin/make/parse.c      Thu Sep 16 00:49:48 1999 +0000
+++ b/usr.bin/make/parse.c      Thu Sep 16 00:54:14 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.46 1999/09/15 10:47:44 mycroft Exp $       */
+/*     $NetBSD: parse.c,v 1.47 1999/09/16 00:54:15 mycroft Exp $       */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -39,14 +39,14 @@
  */
 
 #ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: parse.c,v 1.46 1999/09/15 10:47:44 mycroft Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.47 1999/09/16 00:54:15 mycroft Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)parse.c    8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: parse.c,v 1.46 1999/09/15 10:47:44 mycroft Exp $");
+__RCSID("$NetBSD: parse.c,v 1.47 1999/09/16 00:54:15 mycroft Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -437,7 +437,7 @@
 {
     GNode          *pgn = (GNode *) pgnp;
     GNode          *cgn = (GNode *) cgnp;
-    if ((pgn->type & OP_OPMASK) == OP_DOUBLEDEP && !Lst_IsEmpty (pgn->cohorts))
+    if ((pgn->type & OP_DOUBLEDEP) && !Lst_IsEmpty (pgn->cohorts))
        pgn = (GNode *) Lst_Datum (Lst_Last (pgn->cohorts));
     if (Lst_Member (pgn->children, (ClientData)cgn) == NILLNODE) {
        (void)Lst_AtEnd (pgn->children, (ClientData)cgn);
@@ -1561,7 +1561,7 @@
 {
     GNode *gn = (GNode *) gnp;
     /* if target already supplied, ignore commands */
-    if ((gn->type & OP_OPMASK) == OP_DOUBLEDEP && !Lst_IsEmpty (gn->cohorts))
+    if ((gn->type & OP_DOUBLEDEP) && !Lst_IsEmpty (gn->cohorts))
        gn = (GNode *) Lst_Datum (Lst_Last (gn->cohorts));
     if (!(gn->type & OP_HAS_COMMANDS))
        (void)Lst_AtEnd(gn->commands, cmd);
diff -r 4c39de6ea546 -r b11a178d82bf usr.bin/make/suff.c
--- a/usr.bin/make/suff.c       Thu Sep 16 00:49:48 1999 +0000
+++ b/usr.bin/make/suff.c       Thu Sep 16 00:54:14 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: suff.c,v 1.26 1999/09/15 10:47:44 mycroft Exp $        */
+/*     $NetBSD: suff.c,v 1.27 1999/09/16 00:54:15 mycroft Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -39,14 +39,14 @@
  */
 
 #ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: suff.c,v 1.26 1999/09/15 10:47:44 mycroft Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.27 1999/09/16 00:54:15 mycroft Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)suff.c     8.4 (Berkeley) 3/21/94";
 #else
-__RCSID("$NetBSD: suff.c,v 1.26 1999/09/15 10:47:44 mycroft Exp $");
+__RCSID("$NetBSD: suff.c,v 1.27 1999/09/16 00:54:15 mycroft Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -706,7 +706,7 @@
 {
     GNode *gn = (GNode *) gnp;
 
-    if ((gn->type & OP_OPMASK) == OP_DOUBLEDEP && !Lst_IsEmpty (gn->cohorts))
+    if ((gn->type & OP_DOUBLEDEP) && !Lst_IsEmpty (gn->cohorts))
        gn = (GNode *) Lst_Datum (Lst_Last (gn->cohorts));
     if ((gn->type & OP_TRANSFORM) && Lst_IsEmpty(gn->commands) &&
        Lst_IsEmpty(gn->children))
diff -r 4c39de6ea546 -r b11a178d82bf usr.bin/make/targ.c
--- a/usr.bin/make/targ.c       Thu Sep 16 00:49:48 1999 +0000
+++ b/usr.bin/make/targ.c       Thu Sep 16 00:54:14 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: targ.c,v 1.19 1999/09/15 10:47:45 mycroft Exp $        */
+/*     $NetBSD: targ.c,v 1.20 1999/09/16 00:54:15 mycroft Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -39,14 +39,14 @@
  */
 
 #ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: targ.c,v 1.19 1999/09/15 10:47:45 mycroft Exp $";
+static char rcsid[] = "$NetBSD: targ.c,v 1.20 1999/09/16 00:54:15 mycroft Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)targ.c     8.2 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: targ.c,v 1.19 1999/09/15 10:47:45 mycroft Exp $");
+__RCSID("$NetBSD: targ.c,v 1.20 1999/09/16 00:54:15 mycroft Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -628,7 +628,7 @@
        fputc ('\n', stdout);
        Lst_ForEach (gn->commands, Targ_PrintCmd, (ClientData)0);
        printf("\n\n");
-       if ((gn->type & OP_OPMASK) == OP_DOUBLEDEP) {
+       if (gn->type & OP_DOUBLEDEP) {
            Lst_ForEach (gn->cohorts, TargPrintNode, (ClientData)&pass);
        }
     }
@@ -710,7 +710,7 @@
     ClientData   junk;
 {
     GNode        *gn = (GNode *) gnp;
-    if ((gn->type & OP_OPMASK) == OP_DOUBLEDEP)
+    if (gn->type & OP_DOUBLEDEP)
        Lst_ForEach (gn->cohorts, TargPropagateCohort, gnp);
     return (0);
 }

Prev by Date: [src/trunk]: src/etc Use ${CONFIG} rather than config so cross-builds can cor...
Next by Date: [src/trunk]: src/lib/libipsec temporary workaround against KAME PR 154.
Previous by Thread: [src/trunk]: src/etc Use ${CONFIG} rather than config so cross-builds can cor...
Next by Thread: [src/trunk]: src/lib/libipsec temporary workaround against KAME PR 154.
Indexes:

Home | Main Index | Thread Index | Old Index