commit c54f9530eee722a6959087b3b0938b4bb0a3603b
author Eric Andersen <andersen@codepoet.org> Fri Mar 23 17:03:28 2001 +0000
committer Eric Andersen <andersen@codepoet.org> Fri Mar 23 17:03:28 2001 +0000
tree c222328264cb50dec3176ecb603d2dd27b183887
parent 08ff8a49ba12709413694e2c91fe3d65d8adda5f

-Wshadow loadacm fix from Jeff Garzik

console-tools/loadacm.c

diff --git a/console-tools/loadacm.c b/console-tools/loadacm.c
index e5a29b6..5dbf03e 100644
--- a/console-tools/loadacm.c
+++ b/console-tools/loadacm.c
@@ -149,7 +149,7 @@
 	int tmp_is_unicode;			/* tmp for is_unicode calculation */
 	int i;						/* loop index - result holder */
 	int ret_code = 0;			/* return code */
-	sigset_t sigset, old_sigset;
+	sigset_t acmsigset, old_sigset;
 
 	assert(is_unicode);
 
@@ -163,9 +163,9 @@
 		buf[i] = 0xfffd;
 
 	/* block SIGCHLD */
-	sigemptyset(&sigset);
-	sigaddset(&sigset, SIGCHLD);
-	sigprocmask(SIG_BLOCK, &sigset, &old_sigset);
+	sigemptyset(&acmsigset);
+	sigaddset(&acmsigset, SIGCHLD);
+	sigprocmask(SIG_BLOCK, &acmsigset, &old_sigset);
 
 	do {
 		if (NULL == fgets(buffer, sizeof(buffer), fp)) {

loadacm.c

diff --git a/loadacm.c b/loadacm.c
index e5a29b6..5dbf03e 100644
--- a/loadacm.c
+++ b/loadacm.c
@@ -149,7 +149,7 @@
 	int tmp_is_unicode;			/* tmp for is_unicode calculation */
 	int i;						/* loop index - result holder */
 	int ret_code = 0;			/* return code */
-	sigset_t sigset, old_sigset;
+	sigset_t acmsigset, old_sigset;
 
 	assert(is_unicode);
 
@@ -163,9 +163,9 @@
 		buf[i] = 0xfffd;
 
 	/* block SIGCHLD */
-	sigemptyset(&sigset);
-	sigaddset(&sigset, SIGCHLD);
-	sigprocmask(SIG_BLOCK, &sigset, &old_sigset);
+	sigemptyset(&acmsigset);
+	sigaddset(&acmsigset, SIGCHLD);
+	sigprocmask(SIG_BLOCK, &acmsigset, &old_sigset);
 
 	do {
 		if (NULL == fgets(buffer, sizeof(buffer), fp)) {