diff --git a/ChangeLog b/ChangeLog index 0d2e57dc0e3035859adc789e03e50b39fdf23e41..23f5b482b22912795dbc8447ba9c1b2ba3e8d50c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-06-09 David Lawrence Ramsey <pooka109@gmail.com> * src/*.c: Cosmetic tweaks of comments and whitespace. + * src/help.c, src/rcfile.c, src/winio.c: Elide a function call by + not comparing with an empty string but checking for the final \0. 2014-06-09 Benno Schulenberg <bensberg@justemail.net> * src/nano.c (do_input): Remove two superfluous false conditions. diff --git a/src/help.c b/src/help.c index ea6b92419afded72a28e337d10ac5a8b33cbdb1b..3ec70b816770bdd54a80416f2ba0a8d09d44a5e3 100644 --- a/src/help.c +++ b/src/help.c @@ -419,7 +419,7 @@ void help_init(void) if ((f->menus & currmenu) == 0) continue; - if (!f->desc || !strcmp(f->desc, "")) + if (!f->desc || f->desc[0] == '\0') continue; /* Let's simply show the first two shortcuts from the list. */ diff --git a/src/rcfile.c b/src/rcfile.c index 99c3c45f4115822a90cb53867fff733a0e4686a5..1c6720f923fc0b2bfb99d6bc0a24dc0204966028 100644 --- a/src/rcfile.c +++ b/src/rcfile.c @@ -446,7 +446,7 @@ void parse_binding(char *ptr, bool dobind) funcptr = ptr; ptr = parse_next_word(ptr); - if (!strcmp(funcptr, "")) { + if (funcptr[0] == '\0') { rcfile_error(N_("Must specify a function to bind the key to")); return; } @@ -455,7 +455,7 @@ void parse_binding(char *ptr, bool dobind) menuptr = ptr; ptr = parse_next_word(ptr); - if (!strcmp(menuptr, "")) { + if (menuptr[0] == '\0') { /* TRANSLATORS: Do not translate the word "all". */ rcfile_error(N_("Must specify a menu (or \"all\") in which to bind/unbind the key")); return; diff --git a/src/winio.c b/src/winio.c index 0e282d2c7707f3a5482339e4307fd92943659db7..7259ad39badad897dac8517aada80dd6e172d5c8 100644 --- a/src/winio.c +++ b/src/winio.c @@ -2248,7 +2248,7 @@ void set_modified(void) titlebar(NULL); #ifndef NANO_TINY if (ISSET(LOCKING)) { - if (!strcmp(openfile->filename, "")) + if (openfile->filename[0] == '\0') return; else if (openfile->lock_filename == NULL) { /* TRANSLATORS: Try to keep this at most 76 characters. */