diff options
Diffstat (limited to 'drivers/staging/speakup/varhandlers.c')
| -rw-r--r-- | drivers/staging/speakup/varhandlers.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/staging/speakup/varhandlers.c b/drivers/staging/speakup/varhandlers.c index 7f6288fc2299..9aa2a78cd71c 100644 --- a/drivers/staging/speakup/varhandlers.c +++ b/drivers/staging/speakup/varhandlers.c @@ -137,18 +137,15 @@ struct st_var_header *spk_get_var_header(enum var_id_t var_id) struct st_var_header *spk_var_header_by_name(const char *name) { int i; - struct st_var_header *where = NULL; - if (name != NULL) { - i = 0; - while ((i < MAXVARS) && (where == NULL)) { - if (strcmp(name, var_ptrs[i]->name) == 0) - where = var_ptrs[i]; - else - i++; - } + if (!name) + return NULL; + + for (i = 0; i < MAXVARS; i++) { + if (strcmp(name, var_ptrs[i]->name) == 0) + return var_ptrs[i]; } - return where; + return NULL; } struct var_t *spk_get_var(enum var_id_t var_id) @@ -280,7 +277,7 @@ int spk_set_mask_bits(const char *input, const int which, const int how) spk_chartab[*cp] &= ~mask; } cp = (u_char *)input; - if (cp == 0) + if (!cp) cp = spk_punc_info[which].value; else { for ( ; *cp; cp++) { |