From: Michael R Sweet Date: Sat, 21 Jan 2023 22:14:29 +0000 (-0500) Subject: Eliminate trivial switch's. X-Git-Tag: v2.4.3~61 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e70cfeec7f1063c5b1b6d62776d3ba2c970cd72e;p=thirdparty%2Fcups.git Eliminate trivial switch's. --- diff --git a/cups/file.c b/cups/file.c index 743c30c2ab..2c85ef5c25 100644 --- a/cups/file.c +++ b/cups/file.c @@ -6,7 +6,7 @@ * our own file functions allows us to provide transparent support of * different line endings, gzip'd print files, PPD files, etc. * - * Copyright © 2021-2022 by OpenPrinting. + * Copyright © 2021-2023 by OpenPrinting. * Copyright © 2007-2019 by Apple Inc. * Copyright © 1997-2007 by Easy Software Products, all rights reserved. * @@ -124,17 +124,14 @@ _cupsFileCheck( result = _CUPS_FILE_CHECK_OK; - switch (filetype) + if (filetype == _CUPS_FILE_CHECK_DIRECTORY) { - case _CUPS_FILE_CHECK_DIRECTORY : - if (!S_ISDIR(fileinfo.st_mode)) - result = _CUPS_FILE_CHECK_WRONG_TYPE; - break; - - default : - if (!S_ISREG(fileinfo.st_mode)) - result = _CUPS_FILE_CHECK_WRONG_TYPE; - break; + if (!S_ISDIR(fileinfo.st_mode)) + result = _CUPS_FILE_CHECK_WRONG_TYPE; + } + else if (!S_ISREG(fileinfo.st_mode)) + { + result = _CUPS_FILE_CHECK_WRONG_TYPE; } if (result) diff --git a/scheduler/auth.c b/scheduler/auth.c index aa773f92dd..7f6c3f6d2f 100644 --- a/scheduler/auth.c +++ b/scheduler/auth.c @@ -1,7 +1,7 @@ /* * Authorization routines for the CUPS scheduler. * - * Copyright © 2021-2022 by OpenPrinting. + * Copyright © 2021-2023 by OpenPrinting. * Copyright © 2007-2019 by Apple Inc. * Copyright © 1997-2007 by Easy Software Products, all rights reserved. * @@ -558,166 +558,160 @@ cupsdAuthorize(cupsd_client_t *con) /* I - Client connection */ * Validate the username and password... */ - switch (type) + if (type == CUPSD_AUTH_BASIC) { - default : - case CUPSD_AUTH_BASIC : - { #if HAVE_LIBPAM - /* - * Only use PAM to do authentication. This supports MD5 - * passwords, among other things... - */ + /* + * Only use PAM to do authentication. This supports MD5 + * passwords, among other things... + */ - pam_handle_t *pamh; /* PAM authentication handle */ - int pamerr; /* PAM error code */ - struct pam_conv pamdata;/* PAM conversation data */ - cupsd_authdata_t data; /* Authentication data */ + pam_handle_t *pamh; /* PAM authentication handle */ + int pamerr; /* PAM error code */ + struct pam_conv pamdata; /* PAM conversation data */ + cupsd_authdata_t data; /* Authentication data */ - strlcpy(data.username, username, sizeof(data.username)); - strlcpy(data.password, password, sizeof(data.password)); + strlcpy(data.username, username, sizeof(data.username)); + strlcpy(data.password, password, sizeof(data.password)); # ifdef __sun - pamdata.conv = (int (*)(int, struct pam_message **, - struct pam_response **, - void *))pam_func; + pamdata.conv = (int (*)(int, struct pam_message **, + struct pam_response **, + void *))pam_func; # else - pamdata.conv = pam_func; + pamdata.conv = pam_func; # endif /* __sun */ - pamdata.appdata_ptr = &data; + pamdata.appdata_ptr = &data; - pamerr = pam_start("cups", username, &pamdata, &pamh); - if (pamerr != PAM_SUCCESS) - { - cupsdLogClient(con, CUPSD_LOG_ERROR, "pam_start() returned %d (%s)", pamerr, pam_strerror(pamh, pamerr)); - return; - } + pamerr = pam_start("cups", username, &pamdata, &pamh); + if (pamerr != PAM_SUCCESS) + { + cupsdLogClient(con, CUPSD_LOG_ERROR, "pam_start() returned %d (%s)", pamerr, pam_strerror(pamh, pamerr)); + return; + } # ifdef HAVE_PAM_SET_ITEM # ifdef PAM_RHOST - pamerr = pam_set_item(pamh, PAM_RHOST, con->http->hostname); - if (pamerr != PAM_SUCCESS) - cupsdLogClient(con, CUPSD_LOG_WARN, "pam_set_item(PAM_RHOST) returned %d (%s)", pamerr, pam_strerror(pamh, pamerr)); + pamerr = pam_set_item(pamh, PAM_RHOST, con->http->hostname); + if (pamerr != PAM_SUCCESS) + cupsdLogClient(con, CUPSD_LOG_WARN, "pam_set_item(PAM_RHOST) returned %d (%s)", pamerr, pam_strerror(pamh, pamerr)); # endif /* PAM_RHOST */ # ifdef PAM_TTY - pamerr = pam_set_item(pamh, PAM_TTY, "cups"); - if (pamerr != PAM_SUCCESS) - cupsdLogClient(con, CUPSD_LOG_WARN, "pam_set_item(PAM_TTY) returned %d (%s)", pamerr, pam_strerror(pamh, pamerr)); + pamerr = pam_set_item(pamh, PAM_TTY, "cups"); + if (pamerr != PAM_SUCCESS) + cupsdLogClient(con, CUPSD_LOG_WARN, "pam_set_item(PAM_TTY) returned %d (%s)", pamerr, pam_strerror(pamh, pamerr)); # endif /* PAM_TTY */ # endif /* HAVE_PAM_SET_ITEM */ - pamerr = pam_authenticate(pamh, PAM_SILENT); - if (pamerr != PAM_SUCCESS) - { - cupsdLogClient(con, CUPSD_LOG_ERROR, "pam_authenticate() returned %d (%s)", pamerr, pam_strerror(pamh, pamerr)); - pam_end(pamh, 0); - return; - } + pamerr = pam_authenticate(pamh, PAM_SILENT); + if (pamerr != PAM_SUCCESS) + { + cupsdLogClient(con, CUPSD_LOG_ERROR, "pam_authenticate() returned %d (%s)", pamerr, pam_strerror(pamh, pamerr)); + pam_end(pamh, 0); + return; + } # ifdef HAVE_PAM_SETCRED - pamerr = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT); - if (pamerr != PAM_SUCCESS) - cupsdLogClient(con, CUPSD_LOG_WARN, "pam_setcred() returned %d (%s)", pamerr, pam_strerror(pamh, pamerr)); + pamerr = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT); + if (pamerr != PAM_SUCCESS) + cupsdLogClient(con, CUPSD_LOG_WARN, "pam_setcred() returned %d (%s)", pamerr, pam_strerror(pamh, pamerr)); # endif /* HAVE_PAM_SETCRED */ - pamerr = pam_acct_mgmt(pamh, PAM_SILENT); - if (pamerr != PAM_SUCCESS) - { - cupsdLogClient(con, CUPSD_LOG_ERROR, "pam_acct_mgmt() returned %d (%s)", pamerr, pam_strerror(pamh, pamerr)); - pam_end(pamh, 0); - return; - } + pamerr = pam_acct_mgmt(pamh, PAM_SILENT); + if (pamerr != PAM_SUCCESS) + { + cupsdLogClient(con, CUPSD_LOG_ERROR, "pam_acct_mgmt() returned %d (%s)", pamerr, pam_strerror(pamh, pamerr)); + pam_end(pamh, 0); + return; + } - pam_end(pamh, PAM_SUCCESS); + pam_end(pamh, PAM_SUCCESS); #else - /* - * Use normal UNIX password file-based authentication... - */ + /* + * Use normal UNIX password file-based authentication... + */ - char *pass; /* Encrypted password */ - struct passwd *pw; /* User password data */ + char *pass; /* Encrypted password */ + struct passwd *pw; /* User password data */ # ifdef HAVE_SHADOW_H - struct spwd *spw; /* Shadow password data */ + struct spwd *spw; /* Shadow password data */ # endif /* HAVE_SHADOW_H */ - pw = getpwnam(username); /* Get the current password */ - endpwent(); /* Close the password file */ + pw = getpwnam(username); /* Get the current password */ + endpwent(); /* Close the password file */ - if (!pw) - { - /* - * No such user... - */ + if (!pw) + { + /* + * No such user... + */ - cupsdLogClient(con, CUPSD_LOG_ERROR, "Unknown username \"%s\".", username); - return; - } + cupsdLogClient(con, CUPSD_LOG_ERROR, "Unknown username \"%s\".", username); + return; + } # ifdef HAVE_SHADOW_H - spw = getspnam(username); - endspent(); + spw = getspnam(username); + endspent(); - if (!spw && !strcmp(pw->pw_passwd, "x")) - { - /* - * Don't allow blank passwords! - */ + if (!spw && !strcmp(pw->pw_passwd, "x")) + { + /* + * Don't allow blank passwords! + */ - cupsdLogClient(con, CUPSD_LOG_ERROR, "Username \"%s\" has no shadow password.", username); - return; - } + cupsdLogClient(con, CUPSD_LOG_ERROR, "Username \"%s\" has no shadow password.", username); + return; + } - if (spw && !spw->sp_pwdp[0] && !pw->pw_passwd[0]) + if (spw && !spw->sp_pwdp[0] && !pw->pw_passwd[0]) # else - if (!pw->pw_passwd[0]) + if (!pw->pw_passwd[0]) # endif /* HAVE_SHADOW_H */ - { - /* - * Don't allow blank passwords! - */ + { + /* + * Don't allow blank passwords! + */ - cupsdLogClient(con, CUPSD_LOG_ERROR, "Username \"%s\" has no password.", username); - return; - } + cupsdLogClient(con, CUPSD_LOG_ERROR, "Username \"%s\" has no password.", username); + return; + } - /* - * OK, the password isn't blank, so compare with what came from the - * client... - */ + /* + * OK, the password isn't blank, so compare with what came from the + * client... + */ - pass = crypt(password, pw->pw_passwd); + pass = crypt(password, pw->pw_passwd); - if (!pass || strcmp(pw->pw_passwd, pass)) - { + if (!pass || strcmp(pw->pw_passwd, pass)) + { # ifdef HAVE_SHADOW_H - if (spw) - { - pass = crypt(password, spw->sp_pwdp); + if (spw) + { + pass = crypt(password, spw->sp_pwdp); - if (pass == NULL || strcmp(spw->sp_pwdp, pass)) - { - cupsdLogClient(con, CUPSD_LOG_ERROR, "Authentication failed for user \"%s\".", username); - return; - } - } - else + if (pass == NULL || strcmp(spw->sp_pwdp, pass)) + { + cupsdLogClient(con, CUPSD_LOG_ERROR, "Authentication failed for user \"%s\".", username); + return; + } + } + else # endif /* HAVE_SHADOW_H */ - { - cupsdLogClient(con, CUPSD_LOG_ERROR, "Authentication failed for user \"%s\".", username); - return; - } - } + { + cupsdLogClient(con, CUPSD_LOG_ERROR, "Authentication failed for user \"%s\".", username); + return; + } + } #endif /* HAVE_LIBPAM */ - } - - cupsdLogClient(con, CUPSD_LOG_DEBUG, "Authorized as \"%s\" using Basic.", username); - break; } + cupsdLogClient(con, CUPSD_LOG_DEBUG, "Authorized as \"%s\" using Basic.", username); con->type = type; } #ifdef HAVE_GSSAPI diff --git a/tools/ippeveprinter.c b/tools/ippeveprinter.c index 5facf0447a..d3daffafee 100644 --- a/tools/ippeveprinter.c +++ b/tools/ippeveprinter.c @@ -2270,19 +2270,17 @@ dnssd_client_cb( if (!c) return; - switch (state) + if (state == AVAHI_CLIENT_FAILURE) { - default : - fprintf(stderr, "Ignored Avahi state %d.\n", state); - break; - - case AVAHI_CLIENT_FAILURE: - if (avahi_client_errno(c) == AVAHI_ERR_DISCONNECTED) - { - fputs("Avahi server crashed, exiting.\n", stderr); - exit(1); - } - break; + if (avahi_client_errno(c) == AVAHI_ERR_DISCONNECTED) + { + fputs("Avahi server crashed, exiting.\n", stderr); + exit(1); + } + } + else + { + fprintf(stderr, "Ignored Avahi state %d.\n", state); } } #endif /* HAVE_MDNSRESPONDER */