Module Name: src Committed By: sjg Date: Fri Mar 4 23:17:16 UTC 2022
Modified Files: src/usr.bin/make: meta.c suff.c src/usr.bin/make/filemon: filemon_dev.c Log Message: Fix some unused warnings To generate a diff of this commit: cvs rdiff -u -r1.198 -r1.199 src/usr.bin/make/meta.c cvs rdiff -u -r1.365 -r1.366 src/usr.bin/make/suff.c cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/filemon/filemon_dev.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/meta.c diff -u src/usr.bin/make/meta.c:1.198 src/usr.bin/make/meta.c:1.199 --- src/usr.bin/make/meta.c:1.198 Wed Feb 9 21:28:57 2022 +++ src/usr.bin/make/meta.c Fri Mar 4 23:17:16 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: meta.c,v 1.198 2022/02/09 21:28:57 rillig Exp $ */ +/* $NetBSD: meta.c,v 1.199 2022/03/04 23:17:16 sjg Exp $ */ /* * Implement 'meta' mode. @@ -668,7 +668,7 @@ meta_job_start(Job *job, GNode *gn) * It does not disturb our state. */ void -meta_job_child(Job *job) +meta_job_child(Job *job MAKE_ATTR_UNUSED) { #ifdef USE_FILEMON BuildMon *pbm; @@ -693,7 +693,7 @@ meta_job_child(Job *job) } void -meta_job_parent(Job *job, pid_t pid) +meta_job_parent(Job *job MAKE_ATTR_UNUSED, pid_t pid MAKE_ATTR_UNUSED) { #if defined(USE_FILEMON) && !defined(USE_FILEMON_DEV) BuildMon *pbm; @@ -710,7 +710,7 @@ meta_job_parent(Job *job, pid_t pid) } int -meta_job_fd(Job *job) +meta_job_fd(Job *job MAKE_ATTR_UNUSED) { #if defined(USE_FILEMON) && !defined(USE_FILEMON_DEV) BuildMon *pbm; @@ -728,7 +728,7 @@ meta_job_fd(Job *job) } int -meta_job_event(Job *job) +meta_job_event(Job *job MAKE_ATTR_UNUSED) { #if defined(USE_FILEMON) && !defined(USE_FILEMON_DEV) BuildMon *pbm; Index: src/usr.bin/make/suff.c diff -u src/usr.bin/make/suff.c:1.365 src/usr.bin/make/suff.c:1.366 --- src/usr.bin/make/suff.c:1.365 Thu Mar 3 19:55:27 2022 +++ src/usr.bin/make/suff.c Fri Mar 4 23:17:16 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: suff.c,v 1.365 2022/03/03 19:55:27 rillig Exp $ */ +/* $NetBSD: suff.c,v 1.366 2022/03/04 23:17:16 sjg 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.365 2022/03/03 19:55:27 rillig Exp $"); +MAKE_RCSID("$NetBSD: suff.c,v 1.366 2022/03/04 23:17:16 sjg Exp $"); typedef List SuffixList; typedef ListNode SuffixListNode; @@ -1019,7 +1019,7 @@ Candidate_New(char *name, char *prefix, /*ARGSUSED*/ static void CandidateList_Add(CandidateList *list, char *srcName, Candidate *targ, - Suffix *suff, const char *debug_tag) + Suffix *suff, const char *debug_tag MAKE_ATTR_UNUSED) { Candidate *cand = Candidate_New(srcName, targ->prefix, suff, targ, NULL); Index: src/usr.bin/make/filemon/filemon_dev.c diff -u src/usr.bin/make/filemon/filemon_dev.c:1.8 src/usr.bin/make/filemon/filemon_dev.c:1.9 --- src/usr.bin/make/filemon/filemon_dev.c:1.8 Mon Feb 1 21:09:25 2021 +++ src/usr.bin/make/filemon/filemon_dev.c Fri Mar 4 23:17:16 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: filemon_dev.c,v 1.8 2021/02/01 21:09:25 rillig Exp $ */ +/* $NetBSD: filemon_dev.c,v 1.9 2022/03/04 23:17:16 sjg Exp $ */ /* * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -46,6 +46,10 @@ #define _PATH_FILEMON "/dev/filemon" #endif +#ifndef MAKE_ATTR_UNUSED +#define MAKE_ATTR_UNUSED __attribute__((__unused__)) +#endif + struct filemon { int fd; }; @@ -101,7 +105,7 @@ filemon_setfd(struct filemon *F, int fd) } void -filemon_setpid_parent(struct filemon *F, pid_t pid) +filemon_setpid_parent(struct filemon *F MAKE_ATTR_UNUSED, pid_t pid MAKE_ATTR_UNUSED) { /* Nothing to do! */ } @@ -137,14 +141,14 @@ filemon_close(struct filemon *F) } int -filemon_readfd(const struct filemon *F) +filemon_readfd(const struct filemon *F MAKE_ATTR_UNUSED) { return -1; } int -filemon_process(struct filemon *F) +filemon_process(struct filemon *F MAKE_ATTR_UNUSED) { return 0;