[src/trunk]: src/usr.bin/make make(1): remove redundant function prototypes

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/usr.bin/make make(1): remove redundant function prototypes
From: rillig <rillig%NetBSD.org@localhost>
Date: Sat, 01 May 2021 05:12:40 +0000
details:   https://anonhg.NetBSD.org/src/rev/e80ea941566a
branches:  trunk
changeset: 976720:e80ea941566a
user:      rillig <rillig%NetBSD.org@localhost>
date:      Thu Oct 01 22:42:00 2020 +0000

description:
make(1): remove redundant function prototypes

diffstat:

 usr.bin/make/arch.c        |   5 ++---
 usr.bin/make/compat.c      |   5 ++---
 usr.bin/make/cond.c        |   5 ++---
 usr.bin/make/dir.c         |  11 ++---------
 usr.bin/make/job.c         |  17 ++---------------
 usr.bin/make/main.c        |   5 ++---
 usr.bin/make/make.c        |   9 ++-------
 usr.bin/make/make_malloc.c |   5 ++---
 8 files changed, 16 insertions(+), 46 deletions(-)

diffs (224 lines):

diff -r 0fed7f67da63 -r e80ea941566a usr.bin/make/arch.c
--- a/usr.bin/make/arch.c       Thu Oct 01 21:22:47 2020 +0000
+++ b/usr.bin/make/arch.c       Thu Oct 01 22:42:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arch.c,v 1.126 2020/09/28 22:23:35 rillig Exp $        */
+/*     $NetBSD: arch.c,v 1.127 2020/10/01 22:42:00 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -134,7 +134,7 @@
 #include    "config.h"
 
 /*     "@(#)arch.c     8.2 (Berkeley) 1/2/94"  */
-MAKE_RCSID("$NetBSD: arch.c,v 1.126 2020/09/28 22:23:35 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.127 2020/10/01 22:42:00 rillig Exp $");
 
 #ifdef TARGET_MACHINE
 #undef MAKE_MACHINE
@@ -158,7 +158,6 @@
     size_t       fnamesize;  /* Size of the string table */
 } Arch;
 
-static struct ar_hdr *ArchStatMember(const char *, const char *, Boolean);
 static FILE *ArchFindMember(const char *, const char *,
                            struct ar_hdr *, const char *);
 #if defined(__svr4__) || defined(__SVR4) || defined(__ELF__)
diff -r 0fed7f67da63 -r e80ea941566a usr.bin/make/compat.c
--- a/usr.bin/make/compat.c     Thu Oct 01 21:22:47 2020 +0000
+++ b/usr.bin/make/compat.c     Thu Oct 01 22:42:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat.c,v 1.160 2020/10/01 21:00:55 rillig Exp $      */
+/*     $NetBSD: compat.c,v 1.161 2020/10/01 22:42:00 rillig Exp $      */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -99,10 +99,9 @@
 #include    "pathnames.h"
 
 /*     "@(#)compat.c   8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: compat.c,v 1.160 2020/10/01 21:00:55 rillig Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.161 2020/10/01 22:42:00 rillig Exp $");
 
 static GNode       *curTarg = NULL;
-static void CompatInterrupt(int);
 static pid_t compatChild;
 static int compatSigno;
 
diff -r 0fed7f67da63 -r e80ea941566a usr.bin/make/cond.c
--- a/usr.bin/make/cond.c       Thu Oct 01 21:22:47 2020 +0000
+++ b/usr.bin/make/cond.c       Thu Oct 01 22:42:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cond.c,v 1.155 2020/09/28 23:13:57 rillig Exp $        */
+/*     $NetBSD: cond.c,v 1.156 2020/10/01 22:42:00 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -93,7 +93,7 @@
 #include "dir.h"
 
 /*     "@(#)cond.c     8.2 (Berkeley) 1/2/94"  */
-MAKE_RCSID("$NetBSD: cond.c,v 1.155 2020/09/28 23:13:57 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.156 2020/10/01 22:42:00 rillig Exp $");
 
 /*
  * The parsing of conditional expressions is based on this grammar:
@@ -151,7 +151,6 @@
 } CondParser;
 
 static Token CondParser_Expr(CondParser *par, Boolean);
-static CondEvalResult CondParser_Eval(CondParser *par, Boolean *value);
 
 static unsigned int cond_depth = 0;    /* current .if nesting level */
 static unsigned int cond_min_depth = 0;        /* depth at makefile open */
diff -r 0fed7f67da63 -r e80ea941566a usr.bin/make/dir.c
--- a/usr.bin/make/dir.c        Thu Oct 01 21:22:47 2020 +0000
+++ b/usr.bin/make/dir.c        Thu Oct 01 22:42:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dir.c,v 1.153 2020/09/28 23:13:57 rillig Exp $ */
+/*     $NetBSD: dir.c,v 1.154 2020/10/01 22:42:00 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -136,7 +136,7 @@
 #include "job.h"
 
 /*     "@(#)dir.c      8.2 (Berkeley) 1/2/94"  */
-MAKE_RCSID("$NetBSD: dir.c,v 1.153 2020/09/28 23:13:57 rillig Exp $");
+MAKE_RCSID("$NetBSD: dir.c,v 1.154 2020/10/01 22:42:00 rillig Exp $");
 
 #define DIR_DEBUG0(text) DEBUG0(DIR, text)
 #define DIR_DEBUG1(fmt, arg1) DEBUG1(DIR, fmt, arg1)
@@ -246,13 +246,6 @@
 
 static Hash_Table lmtimes;     /* same as mtimes but for lstat */
 
-static void DirExpandInt(const char *, SearchPath *, StringList *);
-static char *DirLookup(CachedDir *, const char *, const char *, Boolean);
-static char *DirLookupSubdir(CachedDir *, const char *);
-static char *DirFindDot(Boolean, const char *, const char *);
-static char *DirLookupAbs(CachedDir *, const char *, const char *);
-
-
 /*
  * We use stat(2) a lot, cache the results.
  * mtime and mode are all we care about.
diff -r 0fed7f67da63 -r e80ea941566a usr.bin/make/job.c
--- a/usr.bin/make/job.c        Thu Oct 01 21:22:47 2020 +0000
+++ b/usr.bin/make/job.c        Thu Oct 01 22:42:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: job.c,v 1.253 2020/09/28 23:31:18 rillig Exp $ */
+/*     $NetBSD: job.c,v 1.254 2020/10/01 22:42:00 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
 #include "trace.h"
 
 /*     "@(#)job.c      8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.253 2020/09/28 23:31:18 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.254 2020/10/01 22:42:00 rillig Exp $");
 
 # define STATIC static
 
@@ -323,22 +323,9 @@
 
 static sigset_t caught_signals;        /* Set of signals we handle */
 
-static void JobChildSig(int);
-static void JobContinueSig(int);
-static Job *JobFindPid(int, int, Boolean);
-static int JobPrintCommand(void *, void *);
-static void JobClose(Job *);
-static void JobExec(Job *, char **);
-static void JobMakeArgv(Job *, char **);
-static int JobStart(GNode *, int);
-static char *JobOutput(Job *, char *, char *, int);
 static void JobDoOutput(Job *, Boolean);
-static Shell *JobMatchShell(const char *);
 static void JobInterrupt(int, int) MAKE_ATTR_DEAD;
 static void JobRestartJobs(void);
-static void JobTokenAdd(void);
-static void JobSigLock(sigset_t *);
-static void JobSigUnlock(sigset_t *);
 static void JobSigReset(void);
 
 static unsigned
diff -r 0fed7f67da63 -r e80ea941566a usr.bin/make/main.c
--- a/usr.bin/make/main.c       Thu Oct 01 21:22:47 2020 +0000
+++ b/usr.bin/make/main.c       Thu Oct 01 22:42:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.352 2020/09/28 20:46:11 rillig Exp $        */
+/*     $NetBSD: main.c,v 1.353 2020/10/01 22:42:00 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -126,7 +126,7 @@
 #endif
 
 /*     "@(#)main.c     8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.352 2020/09/28 20:46:11 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.353 2020/10/01 22:42:00 rillig Exp $");
 #if defined(MAKE_NATIVE) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\
  The Regents of the University of California.  All rights reserved.");
@@ -171,7 +171,6 @@
 Boolean                        doing_depend;   /* Set while reading .depend */
 static Boolean         jobsRunning;    /* TRUE if the jobs might be running */
 static const char *    tracefile;
-static void            MainParseArgs(int, char **);
 static int             ReadMakefile(const char *);
 static void            usage(void) MAKE_ATTR_DEAD;
 static void            purge_cached_realpaths(void);
diff -r 0fed7f67da63 -r e80ea941566a usr.bin/make/make.c
--- a/usr.bin/make/make.c       Thu Oct 01 21:22:47 2020 +0000
+++ b/usr.bin/make/make.c       Thu Oct 01 22:42:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: make.c,v 1.156 2020/09/28 23:13:57 rillig Exp $        */
+/*     $NetBSD: make.c,v 1.157 2020/10/01 22:42:00 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -107,7 +107,7 @@
 #include    "job.h"
 
 /*     "@(#)make.c     8.1 (Berkeley) 6/6/93"  */
-MAKE_RCSID("$NetBSD: make.c,v 1.156 2020/09/28 23:13:57 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.157 2020/10/01 22:42:00 rillig Exp $");
 
 /* Sequence # to detect recursion. */
 static unsigned int checked = 1;
@@ -117,12 +117,7 @@
  * It is added to by Make_Update and subtracted from by MakeStartJobs */
 static GNodeList *toBeMade;
 
-static int MakeAddChild(void *, void *);
-static int MakeFindChild(void *, void *);
-static Boolean MakeStartJobs(void);
-static int MakePrintStatus(void *, void *);
 static int MakeCheckOrder(void *, void *);
-static int MakeBuildChild(void *, void *);
 static int MakeBuildParent(void *, void *);
 
 void
diff -r 0fed7f67da63 -r e80ea941566a usr.bin/make/make_malloc.c
--- a/usr.bin/make/make_malloc.c        Thu Oct 01 21:22:47 2020 +0000
+++ b/usr.bin/make/make_malloc.c        Thu Oct 01 22:42:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: make_malloc.c,v 1.19 2020/09/13 15:15:51 rillig Exp $  */
+/*     $NetBSD: make_malloc.c,v 1.20 2020/10/01 22:42:00 rillig Exp $  */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -33,10 +33,9 @@
 
 #include "make.h"
 
-MAKE_RCSID("$NetBSD: make_malloc.c,v 1.19 2020/09/13 15:15:51 rillig Exp $");
+MAKE_RCSID("$NetBSD: make_malloc.c,v 1.20 2020/10/01 22:42:00 rillig Exp $");
 
 #ifndef USE_EMALLOC
-static MAKE_ATTR_DEAD void enomem(void);
 
 /* die when out of memory. */
 static MAKE_ATTR_DEAD void
Prev by Date: [src/trunk]: src/external/mit/xorg/bin/xeyes xeyes: Enable anti-aliasing with...
Next by Date: [src/trunk]: src/usr.bin/make make(1): extract MainParseArg into separate fun...
Previous by Thread: [src/trunk]: src/external/mit/xorg/bin/xeyes xeyes: Enable anti-aliasing with...
Next by Thread: [src/trunk]: src/usr.bin/make make(1): extract MainParseArg into separate fun...
Indexes:
Home | Main Index | Thread Index | Old Index