Module Name: src
Committed By: rillig
Date: Thu Oct 1 22:42:00 UTC 2020
Modified Files:
src/usr.bin/make: arch.c compat.c cond.c dir.c job.c main.c make.c
make_malloc.c
Log Message:
make(1): remove redundant function prototypes
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/usr.bin/make/arch.c
cvs rdiff -u -r1.160 -r1.161 src/usr.bin/make/compat.c
cvs rdiff -u -r1.155 -r1.156 src/usr.bin/make/cond.c
cvs rdiff -u -r1.153 -r1.154 src/usr.bin/make/dir.c
cvs rdiff -u -r1.253 -r1.254 src/usr.bin/make/job.c
cvs rdiff -u -r1.352 -r1.353 src/usr.bin/make/main.c
cvs rdiff -u -r1.156 -r1.157 src/usr.bin/make/make.c
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/make_malloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/arch.c
diff -u src/usr.bin/make/arch.c:1.126 src/usr.bin/make/arch.c:1.127
--- src/usr.bin/make/arch.c:1.126 Mon Sep 28 22:23:35 2020
+++ src/usr.bin/make/arch.c Thu Oct 1 22:42:00 2020
@@ -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 @@ typedef struct Arch {
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__)
Index: src/usr.bin/make/compat.c
diff -u src/usr.bin/make/compat.c:1.160 src/usr.bin/make/compat.c:1.161
--- src/usr.bin/make/compat.c:1.160 Thu Oct 1 21:00:55 2020
+++ src/usr.bin/make/compat.c Thu Oct 1 22:42:00 2020
@@ -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;
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.155 src/usr.bin/make/cond.c:1.156
--- src/usr.bin/make/cond.c:1.155 Mon Sep 28 23:13:57 2020
+++ src/usr.bin/make/cond.c Thu Oct 1 22:42:00 2020
@@ -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 @@ typedef struct CondParser {
} 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 */
Index: src/usr.bin/make/dir.c
diff -u src/usr.bin/make/dir.c:1.153 src/usr.bin/make/dir.c:1.154
--- src/usr.bin/make/dir.c:1.153 Mon Sep 28 23:13:57 2020
+++ src/usr.bin/make/dir.c Thu Oct 1 22:42:00 2020
@@ -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 mtimes;
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.
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.253 src/usr.bin/make/job.c:1.254
--- src/usr.bin/make/job.c:1.253 Mon Sep 28 23:31:18 2020
+++ src/usr.bin/make/job.c Thu Oct 1 22:42:00 2020
@@ -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 const int npseudojobs = 2; /* num
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
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.352 src/usr.bin/make/main.c:1.353
--- src/usr.bin/make/main.c:1.352 Mon Sep 28 20:46:11 2020
+++ src/usr.bin/make/main.c Thu Oct 1 22:42:00 2020
@@ -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 varNoExportEnv; /* -X flag */
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);
Index: src/usr.bin/make/make.c
diff -u src/usr.bin/make/make.c:1.156 src/usr.bin/make/make.c:1.157
--- src/usr.bin/make/make.c:1.156 Mon Sep 28 23:13:57 2020
+++ src/usr.bin/make/make.c Thu Oct 1 22:42:00 2020
@@ -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 @@ static unsigned int checked = 1;
* 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
Index: src/usr.bin/make/make_malloc.c
diff -u src/usr.bin/make/make_malloc.c:1.19 src/usr.bin/make/make_malloc.c:1.20
--- src/usr.bin/make/make_malloc.c:1.19 Sun Sep 13 15:15:51 2020
+++ src/usr.bin/make/make_malloc.c Thu Oct 1 22:42:00 2020
@@ -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
