mirror of
https://github.com/sheumann/hush.git
synced 2025-01-13 06:30:09 +00:00
-Wshadow loadacm fix from Jeff Garzik
This commit is contained in:
parent
08ff8a49ba
commit
c54f9530ee
@ -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 tmp_is_unicode; /* tmp for is_unicode calculation */
|
||||||
int i; /* loop index - result holder */
|
int i; /* loop index - result holder */
|
||||||
int ret_code = 0; /* return code */
|
int ret_code = 0; /* return code */
|
||||||
sigset_t sigset, old_sigset;
|
sigset_t acmsigset, old_sigset;
|
||||||
|
|
||||||
assert(is_unicode);
|
assert(is_unicode);
|
||||||
|
|
||||||
@ -163,9 +163,9 @@ static int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode)
|
|||||||
buf[i] = 0xfffd;
|
buf[i] = 0xfffd;
|
||||||
|
|
||||||
/* block SIGCHLD */
|
/* block SIGCHLD */
|
||||||
sigemptyset(&sigset);
|
sigemptyset(&acmsigset);
|
||||||
sigaddset(&sigset, SIGCHLD);
|
sigaddset(&acmsigset, SIGCHLD);
|
||||||
sigprocmask(SIG_BLOCK, &sigset, &old_sigset);
|
sigprocmask(SIG_BLOCK, &acmsigset, &old_sigset);
|
||||||
|
|
||||||
do {
|
do {
|
||||||
if (NULL == fgets(buffer, sizeof(buffer), fp)) {
|
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 tmp_is_unicode; /* tmp for is_unicode calculation */
|
||||||
int i; /* loop index - result holder */
|
int i; /* loop index - result holder */
|
||||||
int ret_code = 0; /* return code */
|
int ret_code = 0; /* return code */
|
||||||
sigset_t sigset, old_sigset;
|
sigset_t acmsigset, old_sigset;
|
||||||
|
|
||||||
assert(is_unicode);
|
assert(is_unicode);
|
||||||
|
|
||||||
@ -163,9 +163,9 @@ static int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode)
|
|||||||
buf[i] = 0xfffd;
|
buf[i] = 0xfffd;
|
||||||
|
|
||||||
/* block SIGCHLD */
|
/* block SIGCHLD */
|
||||||
sigemptyset(&sigset);
|
sigemptyset(&acmsigset);
|
||||||
sigaddset(&sigset, SIGCHLD);
|
sigaddset(&acmsigset, SIGCHLD);
|
||||||
sigprocmask(SIG_BLOCK, &sigset, &old_sigset);
|
sigprocmask(SIG_BLOCK, &acmsigset, &old_sigset);
|
||||||
|
|
||||||
do {
|
do {
|
||||||
if (NULL == fgets(buffer, sizeof(buffer), fp)) {
|
if (NULL == fgets(buffer, sizeof(buffer), fp)) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user