Module Name: src
Committed By: rillig
Date: Fri Jul 5 05:11:25 UTC 2024
Modified Files:
src/usr.bin/make: arch.c job.c main.c make.h suff.c var.c
Log Message:
make: reduce lint-specific comments about ARGSUSED
To generate a diff of this commit:
cvs rdiff -u -r1.219 -r1.220 src/usr.bin/make/arch.c
cvs rdiff -u -r1.478 -r1.479 src/usr.bin/make/job.c
cvs rdiff -u -r1.626 -r1.627 src/usr.bin/make/main.c
cvs rdiff -u -r1.339 -r1.340 src/usr.bin/make/make.h
cvs rdiff -u -r1.380 -r1.381 src/usr.bin/make/suff.c
cvs rdiff -u -r1.1129 -r1.1130 src/usr.bin/make/var.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.219 src/usr.bin/make/arch.c:1.220
--- src/usr.bin/make/arch.c:1.219 Sun Jun 2 15:31:25 2024
+++ src/usr.bin/make/arch.c Fri Jul 5 05:11:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.219 2024/06/02 15:31:25 rillig Exp $ */
+/* $NetBSD: arch.c,v 1.220 2024/07/05 05:11:25 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -126,7 +126,7 @@
#include "config.h"
/* "@(#)arch.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: arch.c,v 1.219 2024/06/02 15:31:25 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.220 2024/07/05 05:11:25 rillig Exp $");
typedef struct List ArchList;
typedef struct ListNode ArchListNode;
@@ -770,7 +770,6 @@ Arch_Touch(GNode *gn)
* Both the modification time of the library and of the RANLIBMAG member are
* set to 'now'.
*/
-/*ARGSUSED*/
void
Arch_TouchLib(GNode *gn MAKE_ATTR_UNUSED)
{
@@ -871,7 +870,6 @@ Arch_FindLib(GNode *gn, SearchPath *path
Var_Set(gn, TARGET, gn->name);
}
-/* ARGSUSED */
static bool
RanlibOODate(const GNode *gn MAKE_ATTR_UNUSED)
{
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.478 src/usr.bin/make/job.c:1.479
--- src/usr.bin/make/job.c:1.478 Fri Jun 28 15:20:57 2024
+++ src/usr.bin/make/job.c Fri Jul 5 05:11:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.478 2024/06/28 15:20:57 rillig Exp $ */
+/* $NetBSD: job.c,v 1.479 2024/07/05 05:11:25 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -141,7 +141,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.478 2024/06/28 15:20:57 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.479 2024/07/05 05:11:25 rillig Exp $");
/*
* A shell defines how the commands are run. All commands for a target are
@@ -594,7 +594,6 @@ JobCondPassSig(int signo)
*
* Sends a token on the child exit pipe to wake us up from select()/poll().
*/
-/*ARGSUSED*/
static void
JobChildSig(int signo MAKE_ATTR_UNUSED)
{
@@ -606,7 +605,6 @@ JobChildSig(int signo MAKE_ATTR_UNUSED)
/* Resume all stopped jobs. */
-/*ARGSUSED*/
static void
JobContinueSig(int signo MAKE_ATTR_UNUSED)
{
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.626 src/usr.bin/make/main.c:1.627
--- src/usr.bin/make/main.c:1.626 Thu Jul 4 20:18:40 2024
+++ src/usr.bin/make/main.c Fri Jul 5 05:11:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.626 2024/07/04 20:18:40 rillig Exp $ */
+/* $NetBSD: main.c,v 1.627 2024/07/05 05:11:25 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -111,7 +111,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.626 2024/07/04 20:18:40 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.627 2024/07/05 05:11:25 rillig Exp $");
#if defined(MAKE_NATIVE)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -789,7 +789,6 @@ AppendWords(StringList *lp, char *str)
}
#ifdef SIGINFO
-/*ARGSUSED*/
static void
siginfo(int signo MAKE_ATTR_UNUSED)
{
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.339 src/usr.bin/make/make.h:1.340
--- src/usr.bin/make/make.h:1.339 Sat Jun 15 20:02:45 2024
+++ src/usr.bin/make/make.h Fri Jul 5 05:11:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.339 2024/06/15 20:02:45 rillig Exp $ */
+/* $NetBSD: make.h,v 1.340 2024/07/05 05:11:25 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
#define MAKE_GNUC_PREREQ(x, y) 0
#endif
-#if MAKE_GNUC_PREREQ(2, 7)
+#if MAKE_GNUC_PREREQ(2, 7) || lint
#define MAKE_ATTR_UNUSED __attribute__((__unused__))
#else
#define MAKE_ATTR_UNUSED /* delete */
@@ -918,7 +918,6 @@ const char *GNodeMade_Name(GNodeMade) MA
#ifdef CLEANUP
void Parse_RegisterCommand(char *);
#else
-/* ARGSUSED */
MAKE_INLINE
void Parse_RegisterCommand(char *cmd MAKE_ATTR_UNUSED)
{
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.380 src/usr.bin/make/suff.c:1.381
--- src/usr.bin/make/suff.c:1.380 Sun Jun 2 15:31:26 2024
+++ src/usr.bin/make/suff.c Fri Jul 5 05:11:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.380 2024/06/02 15:31:26 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.381 2024/07/05 05:11:25 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -115,7 +115,7 @@
#include "dir.h"
/* "@(#)suff.c 8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.380 2024/06/02 15:31:26 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.381 2024/07/05 05:11:25 rillig Exp $");
typedef List SuffixList;
typedef ListNode SuffixListNode;
@@ -979,7 +979,6 @@ Candidate_New(char *name, char *prefix,
}
/* Add a new candidate to the list. */
-/*ARGSUSED*/
static void
CandidateList_Add(CandidateList *list, char *srcName, Candidate *targ,
Suffix *suff, const char *debug_tag MAKE_ATTR_UNUSED)
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.1129 src/usr.bin/make/var.c:1.1130
--- src/usr.bin/make/var.c:1.1129 Thu Jul 4 18:53:37 2024
+++ src/usr.bin/make/var.c Fri Jul 5 05:11:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.1129 2024/07/04 18:53:37 rillig Exp $ */
+/* $NetBSD: var.c,v 1.1130 2024/07/05 05:11:25 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -132,7 +132,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.1129 2024/07/04 18:53:37 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1130 2024/07/05 05:11:25 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -1416,21 +1416,18 @@ SepBuf_DoneData(SepBuf *buf)
typedef void (*ModifyWordProc)(Substring word, SepBuf *buf, void *data);
-/*ARGSUSED*/
static void
ModifyWord_Head(Substring word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED)
{
SepBuf_AddSubstring(buf, Substring_Dirname(word));
}
-/*ARGSUSED*/
static void
ModifyWord_Tail(Substring word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED)
{
SepBuf_AddSubstring(buf, Substring_Basename(word));
}
-/*ARGSUSED*/
static void
ModifyWord_Suffix(Substring word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED)
{
@@ -1439,7 +1436,6 @@ ModifyWord_Suffix(Substring word, SepBuf
SepBuf_AddRange(buf, lastDot + 1, word.end);
}
-/*ARGSUSED*/
static void
ModifyWord_Root(Substring word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED)
{
@@ -1761,7 +1757,6 @@ VarSelectWords(const char *str, int firs
}
-/*ARGSUSED*/
static void
ModifyWord_Realpath(Substring word, SepBuf *buf, void *data MAKE_ATTR_UNUSED)
{
@@ -3060,7 +3055,6 @@ ApplyModifier_Quote(const char **pp, Mod
return AMR_OK;
}
-/*ARGSUSED*/
static void
ModifyWord_Copy(Substring word, SepBuf *buf, void *data MAKE_ATTR_UNUSED)
{
