Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/bin/sh bin/sh: Fixes -Werror=shadow causing build breaks.
details: https://anonhg.NetBSD.org/src/rev/2282158e0115
branches: trunk
changeset: 744584:2282158e0115
user: fox <fox%NetBSD.org@localhost>
date: Fri Feb 07 01:25:08 2020 +0000
description:
bin/sh: Fixes -Werror=shadow causing build breaks.
Conflicting variable name, sigset_t sigs has been renamed to sigset_t mask
Reviewed by: kamil@
diffstat:
bin/sh/main.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diffs (40 lines):
diff -r 00470d964878 -r 2282158e0115 bin/sh/main.c
--- a/bin/sh/main.c Fri Feb 07 01:19:46 2020 +0000
+++ b/bin/sh/main.c Fri Feb 07 01:25:08 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.84 2020/02/06 20:08:28 kre Exp $ */
+/* $NetBSD: main.c,v 1.85 2020/02/07 01:25:08 fox Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.7 (Berkeley) 7/19/95";
#else
-__RCSID("$NetBSD: main.c,v 1.84 2020/02/06 20:08:28 kre Exp $");
+__RCSID("$NetBSD: main.c,v 1.85 2020/02/07 01:25:08 fox Exp $");
#endif
#endif /* not lint */
@@ -108,7 +108,7 @@
char *shinit;
uid_t uid;
gid_t gid;
- sigset_t sigs;
+ sigset_t mask;
/*
* If we happen to be invoked with SIGCHLD ignored, we cannot
@@ -121,9 +121,9 @@
/*
* Similarly, SIGCHLD must not be blocked
*/
- sigemptyset(&sigs);
- sigaddset(&sigs, SIGCHLD);
- sigprocmask(SIG_UNBLOCK, &sigs, NULL);
+ sigemptyset(&mask);
+ sigaddset(&mask, SIGCHLD);
+ sigprocmask(SIG_UNBLOCK, &mask, NULL);
uid = getuid();
gid = getgid();
Home |
Main Index |
Thread Index |
Old Index