diff options
| author | Eric Andersen | 2001-03-23 17:03:28 +0000 |
|---|---|---|
| committer | Eric Andersen | 2001-03-23 17:03:28 +0000 |
| commit | c54f9530eee722a6959087b3b0938b4bb0a3603b (patch) | |
| tree | c222328264cb50dec3176ecb603d2dd27b183887 | |
| parent | 08ff8a49ba12709413694e2c91fe3d65d8adda5f (diff) | |
| download | busybox-c54f9530eee722a6959087b3b0938b4bb0a3603b.zip busybox-c54f9530eee722a6959087b3b0938b4bb0a3603b.tar.gz | |
-Wshadow loadacm fix from Jeff Garzik
| -rw-r--r-- | console-tools/loadacm.c | 8 | ||||
| -rw-r--r-- | loadacm.c | 8 |
2 files changed, 8 insertions, 8 deletions
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 @@ static int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode) 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 @@ static int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode) 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)) { @@ -149,7 +149,7 @@ static int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode) 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 @@ static int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode) 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)) { |