diff options
Diffstat (limited to 'scheduler')
-rw-r--r-- | scheduler/main.c | 4 | ||||
-rw-r--r-- | scheduler/util.c | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/scheduler/main.c b/scheduler/main.c index bd6080a50..edd49d906 100644 --- a/scheduler/main.c +++ b/scheduler/main.c @@ -232,7 +232,6 @@ main(int argc, /* I - Number of command-line args */ case 'h' : /* Show usage/help */ usage(0); - break; case 'l' : /* Started by launchd/systemd/upstart... */ #ifdef HAVE_ONDEMAND @@ -312,7 +311,6 @@ main(int argc, /* I - Number of command-line args */ _cupsLangPrintf(stderr, _("cupsd: Unknown option \"%c\" - " "aborting."), *opt); usage(1); - break; } } } @@ -1888,7 +1886,6 @@ service_add_listener(int fd, /* I - Socket file descriptor */ { cupsdLogMessage(CUPSD_LOG_ERROR, "service_add_listener: Unable to allocate listener: %s.", strerror(errno)); exit(EXIT_FAILURE); - return; } cupsArrayAdd(Listeners, lis); @@ -1940,7 +1937,6 @@ service_checkin(void) { cupsdLogMessage(CUPSD_LOG_ERROR, "service_checkin: Unable to get listener sockets: %s", strerror(error)); exit(EXIT_FAILURE); - return; /* anti-compiler-warning */ } /* diff --git a/scheduler/util.c b/scheduler/util.c index 865690444..228733f38 100644 --- a/scheduler/util.c +++ b/scheduler/util.c @@ -108,7 +108,7 @@ cupsdCompareNames(const char *s, /* I - First string */ return (-1); else if (digits > 0) return (1); - else if (diff) + else return (diff); } else if (tolower(*s) < tolower(*t)) @@ -142,10 +142,10 @@ cupsdCompareNames(const char *s, /* I - First string */ cups_array_t * /* O - CUPS array */ cupsdCreateStringsArray(const char *s) /* I - Comma-delimited strings */ { - if (!s || !*s) - return (NULL); - else + if (s && *s) return (_cupsArrayNewStrings(s, ',')); + else + return (NULL); } |