From: Todd C. Miller Date: Mon, 24 Jan 2011 19:54:27 +0000 (-0500) Subject: standardize on "return foo;" rather than "return(foo);" or "return (foo);" X-Git-Tag: SUDO_1_7_5~53 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa49093eed36493ffb2d96b8e5a21804ea88c2fd;p=sudo standardize on "return foo;" rather than "return(foo);" or "return (foo);" --HG-- branch : 1.7 --- diff --git a/aix.c b/aix.c index ec0b9fb03..51b395b69 100644 --- a/aix.c +++ b/aix.c @@ -75,10 +75,10 @@ aix_getlimit(user, lim, valp) if (getuserattr(user, lim, &val, SEC_INT) != 0 && getuserattr("default", lim, &val, SEC_INT) != 0) { - return(-1); + return -1; } *valp = val; - return(0); + return 0; } static void diff --git a/alias.c b/alias.c index b1f57e7ec..e5af9f8d3 100644 --- a/alias.c +++ b/alias.c @@ -69,7 +69,7 @@ alias_compare(v1, v2) res = 1; else if ((res = strcmp(a1->name, a2->name)) == 0) res = a1->type - a2->type; - return(res); + return res; } /* @@ -95,10 +95,10 @@ alias_find(name, type) */ a = node->data; if (a->seqno == alias_seqno) - return(NULL); + return NULL; a->seqno = alias_seqno; } - return(a); + return a; } /* @@ -122,9 +122,9 @@ alias_add(name, type, members) if (rbinsert(aliases, a)) { snprintf(errbuf, sizeof(errbuf), "Alias `%s' already defined", name); alias_free(a); - return(errbuf); + return errbuf; } - return(NULL); + return NULL; } /* @@ -144,7 +144,7 @@ alias_apply(func, cookie) int no_aliases() { - return(rbisempty(aliases)); + return rbisempty(aliases); } /* @@ -187,9 +187,9 @@ alias_remove(name, type) key.name = name; key.type = type; if ((node = rbfind(aliases, &key)) == NULL) - return(NULL); + return NULL; a = rbdelete(aliases, node); - return(a); + return a; } void diff --git a/alloc.c b/alloc.c index b0b4b6cff..8d403751a 100644 --- a/alloc.c +++ b/alloc.c @@ -79,7 +79,7 @@ emalloc(size) if ((ptr = malloc(size)) == NULL) errorx(1, "unable to allocate memory"); - return(ptr); + return ptr; } /* @@ -101,7 +101,7 @@ emalloc2(nmemb, size) size *= nmemb; if ((ptr = malloc(size)) == NULL) errorx(1, "unable to allocate memory"); - return(ptr); + return ptr; } /* @@ -121,7 +121,7 @@ erealloc(ptr, size) ptr = ptr ? realloc(ptr, size) : malloc(size); if (ptr == NULL) errorx(1, "unable to allocate memory"); - return(ptr); + return ptr; } /* @@ -146,7 +146,7 @@ erealloc3(ptr, nmemb, size) ptr = ptr ? realloc(ptr, size) : malloc(size); if (ptr == NULL) errorx(1, "unable to allocate memory"); - return(ptr); + return ptr; } /* @@ -165,7 +165,7 @@ estrdup(src) dst = (char *) emalloc(size); (void) memcpy(dst, src, size); } - return(dst); + return dst; } /* @@ -194,7 +194,7 @@ easprintf(ret, fmt, va_alist) if (len == -1) errorx(1, "unable to allocate memory"); - return(len); + return len; } /* @@ -211,7 +211,7 @@ evasprintf(ret, format, args) if ((len = vasprintf(ret, format, args)) == -1) errorx(1, "unable to allocate memory"); - return(len); + return len; } /* diff --git a/auth/afs.c b/auth/afs.c index 2b9d7b9bf..f436289f7 100644 --- a/auth/afs.c +++ b/auth/afs.c @@ -67,7 +67,7 @@ afs_verify(pw, pass, auth) 0, /* lifetime */ &afs_token, /* token */ 0) == 0) /* new */ - return(AUTH_SUCCESS); + return AUTH_SUCCESS; /* Fall back on old method XXX - needed? */ setpag(); @@ -80,7 +80,7 @@ afs_verify(pw, pass, auth) NULL, /* expiration ptr (unused) */ 0, /* spare */ NULL) == 0) /* reason */ - return(AUTH_SUCCESS); + return AUTH_SUCCESS; - return(AUTH_FAILURE); + return AUTH_FAILURE; } diff --git a/auth/aix_auth.c b/auth/aix_auth.c index 7a776be0f..fe65b0b66 100644 --- a/auth/aix_auth.c +++ b/auth/aix_auth.c @@ -69,7 +69,7 @@ aixauth_verify(pw, prompt, auth) free(message); zero_bytes(pass, strlen(pass)); } - return(rval); + return rval; } int @@ -80,5 +80,5 @@ aixauth_cleanup(pw, auth) /* Unset AUTHSTATE as it may not be correct for the runas user. */ unsetenv("AUTHSTATE"); - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } diff --git a/auth/bsdauth.c b/auth/bsdauth.c index 2539713ac..727df13b0 100644 --- a/auth/bsdauth.c +++ b/auth/bsdauth.c @@ -65,7 +65,7 @@ bsdauth_init(pw, promptp, auth) if ((as = auth_open()) == NULL) { log_error(USE_ERRNO|NO_EXIT|NO_MAIL, "unable to begin bsd authentication"); - return(AUTH_FATAL); + return AUTH_FATAL; } /* XXX - maybe sanity check the auth style earlier? */ @@ -73,7 +73,7 @@ bsdauth_init(pw, promptp, auth) if (login_style == NULL) { log_error(NO_EXIT|NO_MAIL, "invalid authentication type"); auth_close(as); - return(AUTH_FATAL); + return AUTH_FATAL; } if (auth_setitem(as, AUTHV_STYLE, login_style) < 0 || @@ -81,11 +81,11 @@ bsdauth_init(pw, promptp, auth) auth_setitem(as, AUTHV_CLASS, login_class) < 0) { log_error(NO_EXIT|NO_MAIL, "unable to setup authentication"); auth_close(as); - return(AUTH_FATAL); + return AUTH_FATAL; } auth->data = (void *) as; - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } int @@ -146,14 +146,14 @@ bsdauth_verify(pw, prompt, auth) (void) sigaction(SIGCHLD, &osa, NULL); if (authok) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; if (!pass) - return(AUTH_INTR); + return AUTH_INTR; if ((s = auth_getvalue(as, "errormsg")) != NULL) log_error(NO_EXIT|NO_MAIL, "%s", s); - return(AUTH_FAILURE); + return AUTH_FAILURE; } int @@ -165,5 +165,5 @@ bsdauth_cleanup(pw, auth) auth_close(as); - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } diff --git a/auth/dce.c b/auth/dce.c index 76b43b3f8..3333a7203 100644 --- a/auth/dce.c +++ b/auth/dce.c @@ -89,7 +89,7 @@ dce_verify(pw, plain_pw, auth) sec_login_no_flags, &login_context, &status)) { if (check_dce_status(status, "sec_login_setup_identity(1):")) - return(AUTH_FAILURE); + return AUTH_FAILURE; password_rec.key.key_type = sec_passwd_plain; password_rec.key.tagged_union.plain = (idl_char *) plain_pw; @@ -101,7 +101,7 @@ dce_verify(pw, plain_pw, auth) &reset_passwd, &auth_src, &status)) { if (check_dce_status(status, "sec_login_validate_identity(1):")) - return(AUTH_FAILURE); + return AUTH_FAILURE; /* * Certify that the DCE Security Server used to set @@ -111,10 +111,10 @@ dce_verify(pw, plain_pw, auth) if (!sec_login_certify_identity(login_context, &status)) { (void) fprintf(stderr, "Whoa! Bogus authentication server!\n"); (void) check_dce_status(status,"sec_login_certify_identity(1):"); - return(AUTH_FAILURE); + return AUTH_FAILURE; } if (check_dce_status(status, "sec_login_certify_identity(2):")) - return(AUTH_FAILURE); + return AUTH_FAILURE; /* * Sets the network credentials to those specified @@ -122,7 +122,7 @@ dce_verify(pw, plain_pw, auth) */ sec_login_set_context(login_context, &status); if (check_dce_status(status, "sec_login_set_context:")) - return(AUTH_FAILURE); + return AUTH_FAILURE; /* * Oops, your credentials were no good. Possibly @@ -132,13 +132,13 @@ dce_verify(pw, plain_pw, auth) if (auth_src != sec_login_auth_src_network) { (void) fprintf(stderr, "You have no network credentials.\n"); - return(AUTH_FAILURE); + return AUTH_FAILURE; } /* Check if the password has aged and is thus no good */ if (reset_passwd) { (void) fprintf(stderr, "Your DCE password needs resetting.\n"); - return(AUTH_FAILURE); + return AUTH_FAILURE; } /* @@ -150,7 +150,7 @@ dce_verify(pw, plain_pw, auth) sec_login_get_pwent(login_context, (sec_login_passwd_t) &temp_pw, &status); if (check_dce_status(status, "sec_login_get_pwent:")) - return(AUTH_FAILURE); + return AUTH_FAILURE; /* * If we get to here, then the pwent above properly fetched @@ -172,17 +172,17 @@ dce_verify(pw, plain_pw, auth) * somewhere later in the program. */ sec_login_purge_context(&login_context, &status); - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } else { if(check_dce_status(status, "sec_login_validate_identity(2):")) - return(AUTH_FAILURE); + return AUTH_FAILURE; sec_login_purge_context(&login_context, &status); if(check_dce_status(status, "sec_login_purge_context:")) - return(AUTH_FAILURE); + return AUTH_FAILURE; } } (void) check_dce_status(status, "sec_login_setup_identity(2):"); - return(AUTH_FAILURE); + return AUTH_FAILURE; } /* Returns 0 for DCE "ok" status, 1 otherwise */ @@ -195,8 +195,8 @@ check_dce_status(input_status, comment) unsigned char error_string[dce_c_error_string_len]; if (input_status == rpc_s_ok) - return(0); + return 0; dce_error_inq_text(input_status, error_string, &error_stat); (void) fprintf(stderr, "%s %s\n", comment, error_string); - return(1); + return 1; } diff --git a/auth/fwtk.c b/auth/fwtk.c index fba99e809..f1c164e97 100644 --- a/auth/fwtk.c +++ b/auth/fwtk.c @@ -60,25 +60,25 @@ fwtk_init(pw, promptp, auth) if ((confp = cfg_read("sudo")) == (Cfg *)-1) { warningx("cannot read fwtk config"); - return(AUTH_FATAL); + return AUTH_FATAL; } if (auth_open(confp)) { warningx("cannot connect to authentication server"); - return(AUTH_FATAL); + return AUTH_FATAL; } /* Get welcome message from auth server */ if (auth_recv(resp, sizeof(resp))) { warningx("lost connection to authentication server"); - return(AUTH_FATAL); + return AUTH_FATAL; } if (strncmp(resp, "Authsrv ready", 13) != 0) { warningx("authentication server error:\n%s", resp); - return(AUTH_FATAL); + return AUTH_FATAL; } - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } int @@ -97,7 +97,7 @@ fwtk_verify(pw, prompt, auth) restart: if (auth_send(buf) || auth_recv(resp, sizeof(resp))) { warningx("lost connection to authentication server"); - return(AUTH_FATAL); + return AUTH_FATAL; } /* Get the password/response from the user. */ @@ -119,10 +119,10 @@ restart: goto restart; } else { warningx("%s", resp); - return(AUTH_FATAL); + return AUTH_FATAL; } if (!pass) { /* ^C or error */ - return(AUTH_INTR); + return AUTH_INTR; } /* Send the user's response to the server */ @@ -145,7 +145,7 @@ restart: done: zero_bytes(pass, strlen(pass)); zero_bytes(buf, strlen(buf)); - return(error); + return error; } int @@ -155,5 +155,5 @@ fwtk_cleanup(pw, auth) { auth_close(); - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } diff --git a/auth/kerb4.c b/auth/kerb4.c index 86bfc03d5..883035d95 100644 --- a/auth/kerb4.c +++ b/auth/kerb4.c @@ -57,16 +57,16 @@ kerb4_init(pw, promptp, auth) /* Don't try to verify root */ if (pw->pw_uid == 0) - return(AUTH_FAILURE); + return AUTH_FAILURE; /* Get the local realm, or retrun failure (no krb.conf) */ if (krb_get_lrealm(realm, 1) != KSUCCESS) - return(AUTH_FAILURE); + return AUTH_FAILURE; /* Stash a pointer to the realm (used in kerb4_verify) */ auth->data = (void *) realm; - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } int @@ -94,7 +94,7 @@ kerb4_verify(pw, pass, auth) switch (error) { case INTK_OK: dest_tkt(); /* we are done with the temp ticket */ - return(AUTH_SUCCESS); + return AUTH_SUCCESS; break; case INTK_BADPW: case KDC_PR_UNKNOWN: @@ -104,5 +104,5 @@ kerb4_verify(pw, pass, auth) krb_err_txt[error]); } - return(AUTH_FAILURE); + return AUTH_FAILURE; } diff --git a/auth/kerb5.c b/auth/kerb5.c index 230898f7f..4ce04aa12 100644 --- a/auth/kerb5.c +++ b/auth/kerb5.c @@ -110,7 +110,7 @@ kerb5_init(pw, promptp, auth) error = krb5_init_context(&(sudo_krb5_data.sudo_context)); #endif if (error) - return(AUTH_FAILURE); + return AUTH_FAILURE; sudo_context = sudo_krb5_data.sudo_context; if ((error = krb5_parse_name(sudo_context, pw->pw_name, @@ -118,7 +118,7 @@ kerb5_init(pw, promptp, auth) log_error(NO_EXIT|NO_MAIL, "%s: unable to parse '%s': %s", auth->name, pw->pw_name, error_message(error)); - return(AUTH_FAILURE); + return AUTH_FAILURE; } princ = sudo_krb5_data.princ; @@ -131,7 +131,7 @@ kerb5_init(pw, promptp, auth) log_error(NO_EXIT|NO_MAIL, "%s: unable to unparse princ ('%s'): %s", auth->name, pw->pw_name, error_message(error)); - return(AUTH_FAILURE); + return AUTH_FAILURE; } /* Only rewrite prompt if user didn't specify their own. */ @@ -148,11 +148,11 @@ kerb5_init(pw, promptp, auth) log_error(NO_EXIT|NO_MAIL, "%s: unable to resolve ccache: %s", auth->name, error_message(error)); - return(AUTH_FAILURE); + return AUTH_FAILURE; } ccache = sudo_krb5_data.ccache; - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } #ifdef HAVE_KRB5_VERIFY_USER @@ -172,7 +172,7 @@ kerb5_verify(pw, pass, auth) ccache = ((sudo_krb5_datap) auth->data)->ccache; error = krb5_verify_user(sudo_context, princ, ccache, pass, 1, NULL); - return (error ? AUTH_FAILURE : AUTH_SUCCESS); + return error ? AUTH_FAILURE : AUTH_SUCCESS; } #else int @@ -243,7 +243,7 @@ done: } if (creds) krb5_free_cred_contents(sudo_context, creds); - return (error ? AUTH_FAILURE : AUTH_SUCCESS); + return error ? AUTH_FAILURE : AUTH_SUCCESS; } #endif @@ -268,7 +268,7 @@ kerb5_cleanup(pw, auth) krb5_free_context(sudo_context); } - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } #ifndef HAVE_KRB5_VERIFY_USER @@ -299,7 +299,7 @@ verify_krb_v5_tgt(sudo_context, cred, auth_name) log_error(NO_EXIT|NO_MAIL, "%s: unable to get host principal: %s", auth_name, error_message(error)); - return(-1); + return -1; } /* Initialize verify opts and set secure mode */ @@ -314,6 +314,6 @@ verify_krb_v5_tgt(sudo_context, cred, auth_name) log_error(NO_EXIT|NO_MAIL, "%s: Cannot verify TGT! Possible attack!: %s", auth_name, error_message(error)); - return(error); + return error; } #endif diff --git a/auth/pam.c b/auth/pam.c index c2a5b3e38..265de36e3 100644 --- a/auth/pam.c +++ b/auth/pam.c @@ -102,7 +102,7 @@ pam_init(pw, promptp, auth) if (pam_status != PAM_SUCCESS) { log_error(USE_ERRNO|NO_EXIT|NO_MAIL, "unable to initialize PAM"); - return(AUTH_FATAL); + return AUTH_FATAL; } /* @@ -124,7 +124,7 @@ pam_init(pw, promptp, auth) else (void) pam_set_item(pamh, PAM_TTY, user_ttypath); - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } int @@ -145,11 +145,11 @@ pam_verify(pw, prompt, auth) *pam_status = pam_acct_mgmt(pamh, PAM_SILENT); switch (*pam_status) { case PAM_SUCCESS: - return(AUTH_SUCCESS); + return AUTH_SUCCESS; case PAM_AUTH_ERR: log_error(NO_EXIT|NO_MAIL, "account validation failure, is your account locked?"); - return(AUTH_FATAL); + return AUTH_FATAL; case PAM_NEW_AUTHTOK_REQD: log_error(NO_EXIT|NO_MAIL, "%s, %s", "Account or password is expired", @@ -157,33 +157,33 @@ pam_verify(pw, prompt, auth) *pam_status = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK); if (*pam_status == PAM_SUCCESS) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; if ((s = pam_strerror(pamh, *pam_status))) log_error(NO_EXIT|NO_MAIL, "pam_chauthtok: %s", s); - return(AUTH_FAILURE); + return AUTH_FAILURE; case PAM_AUTHTOK_EXPIRED: log_error(NO_EXIT|NO_MAIL, "Password expired, contact your system administrator"); - return(AUTH_FATAL); + return AUTH_FATAL; case PAM_ACCT_EXPIRED: log_error(NO_EXIT|NO_MAIL, "%s %s", "Account expired or PAM config lacks an \"account\"", "section for sudo, contact your system administrator"); - return(AUTH_FATAL); + return AUTH_FATAL; } /* FALLTHROUGH */ case PAM_AUTH_ERR: if (gotintr) { /* error or ^C from tgetpass() */ - return(AUTH_INTR); + return AUTH_INTR; } case PAM_MAXTRIES: case PAM_PERM_DENIED: - return(AUTH_FAILURE); + return AUTH_FAILURE; default: if ((s = pam_strerror(pamh, *pam_status))) log_error(NO_EXIT|NO_MAIL, "pam_authenticate: %s", s); - return(AUTH_FATAL); + return AUTH_FATAL; } } @@ -196,10 +196,10 @@ pam_cleanup(pw, auth) /* If successful, we can't close the session until pam_prep_user() */ if (auth->status == AUTH_SUCCESS) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; *pam_status = pam_end(pamh, *pam_status | PAM_DATA_SILENT); - return(*pam_status == PAM_SUCCESS ? AUTH_SUCCESS : AUTH_FAILURE); + return *pam_status == PAM_SUCCESS ? AUTH_SUCCESS : AUTH_FAILURE; } int @@ -235,7 +235,7 @@ pam_begin_session(pw) pamh = NULL; } #endif - return(status == PAM_SUCCESS ? AUTH_SUCCESS : AUTH_FAILURE); + return status == PAM_SUCCESS ? AUTH_SUCCESS : AUTH_FAILURE; } int @@ -249,7 +249,7 @@ pam_end_session() #endif status = pam_end(pamh, PAM_SUCCESS | PAM_DATA_SILENT); } - return(status == PAM_SUCCESS ? AUTH_SUCCESS : AUTH_FAILURE); + return status == PAM_SUCCESS ? AUTH_SUCCESS : AUTH_FAILURE; } /* @@ -270,7 +270,7 @@ sudo_conv(num_msg, msg, response, appdata_ptr) int n, flags, std_prompt; if ((*response = malloc(num_msg * sizeof(struct pam_response))) == NULL) - return(PAM_SYSTEM_ERR); + return PAM_SYSTEM_ERR; zero_bytes(*response, num_msg * sizeof(struct pam_response)); for (pr = *response, pm = *msg, n = num_msg; n--; pr++, pm++) { @@ -332,7 +332,7 @@ sudo_conv(num_msg, msg, response, appdata_ptr) } } - return(PAM_SUCCESS); + return PAM_SUCCESS; err: /* Zero and free allocated memory and return an error. */ @@ -346,5 +346,5 @@ err: zero_bytes(*response, num_msg * sizeof(struct pam_response)); free(*response); *response = NULL; - return(gotintr ? PAM_AUTH_ERR : PAM_CONV_ERR); + return gotintr ? PAM_AUTH_ERR : PAM_CONV_ERR; } diff --git a/auth/passwd.c b/auth/passwd.c index c644ec222..8835c0363 100644 --- a/auth/passwd.c +++ b/auth/passwd.c @@ -57,12 +57,12 @@ passwd_init(pw, promptp, auth) { #ifdef HAVE_SKEYACCESS if (skeyaccess(pw, user_tty, NULL, NULL) == 0) - return(AUTH_FAILURE); + return AUTH_FAILURE; #endif sudo_setspent(); auth->data = sudo_getepw(pw); sudo_endspent(); - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } int @@ -82,7 +82,7 @@ passwd_verify(pw, pass, auth) /* Ultrix shadow passwords may use crypt16() */ error = strcmp(pw_epasswd, (char *) crypt16(pass, pw_epasswd)); if (!error) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; #endif /* HAVE_GETAUTHUID */ /* @@ -105,7 +105,7 @@ passwd_verify(pw, pass, auth) else error = strcmp(pw_epasswd, epass); - return(error ? AUTH_FAILURE : AUTH_SUCCESS); + return error ? AUTH_FAILURE : AUTH_SUCCESS; } int @@ -119,5 +119,5 @@ passwd_cleanup(pw, auth) zero_bytes(pw_epasswd, strlen(pw_epasswd)); efree(pw_epasswd); } - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } diff --git a/auth/rfc1938.c b/auth/rfc1938.c index 3bc39c302..b0640e567 100644 --- a/auth/rfc1938.c +++ b/auth/rfc1938.c @@ -104,9 +104,9 @@ rfc1938_setup(pw, promptp, auth) if (rfc1938challenge(&rfc1938, pw->pw_name, challenge, sizeof(challenge))) { if (IS_ONEANDONLY(auth)) { warningx("you do not exist in the %s database", auth->name); - return(AUTH_FATAL); + return AUTH_FATAL; } else { - return(AUTH_FAILURE); + return AUTH_FAILURE; } } @@ -123,7 +123,7 @@ rfc1938_setup(pw, promptp, auth) orig_prompt, challenge); *promptp = new_prompt; - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } int @@ -134,7 +134,7 @@ rfc1938_verify(pw, pass, auth) { if (rfc1938verify((struct RFC1938 *) auth->data, pass) == 0) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; else - return(AUTH_FAILURE); + return AUTH_FAILURE; } diff --git a/auth/secureware.c b/auth/secureware.c index 5076856dd..c1c43d04c 100644 --- a/auth/secureware.c +++ b/auth/secureware.c @@ -62,12 +62,12 @@ secureware_init(pw, promptp, auth) extern int crypt_type; if (crypt_type == INT_MAX) - return(AUTH_FAILURE); /* no shadow */ + return AUTH_FAILURE; /* no shadow */ #endif sudo_setspent(); auth->data = sudo_getepw(pw); sudo_endspent(); - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } int @@ -82,22 +82,22 @@ secureware_verify(pw, pass, auth) # ifdef HAVE_DISPCRYPT if (strcmp(pw_epasswd, dispcrypt(pass, pw_epasswd, crypt_type)) == 0) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; # else if (crypt_type == AUTH_CRYPT_BIGCRYPT) { if (strcmp(pw_epasswd, bigcrypt(pass, pw_epasswd)) == 0) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } else if (crypt_type == AUTH_CRYPT_CRYPT16) { if (strcmp(pw_epasswd, crypt(pass, pw_epasswd)) == 0) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } # endif /* HAVE_DISPCRYPT */ #elif defined(HAVE_BIGCRYPT) if (strcmp(pw_epasswd, bigcrypt(pass, pw_epasswd)) == 0) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; #endif /* __alpha */ - return(AUTH_FAILURE); + return AUTH_FAILURE; } int @@ -111,5 +111,5 @@ secureware_cleanup(pw, auth) zero_bytes(pw_epasswd, strlen(pw_epasswd)); efree(pw_epasswd); } - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } diff --git a/auth/securid.c b/auth/securid.c index 6aec1098f..83ff94c13 100644 --- a/auth/securid.c +++ b/auth/securid.c @@ -66,9 +66,9 @@ securid_init(pw, promptp, auth) auth->data = (void *) &sd_dat; /* For method-specific data */ if (creadcfg() == 0) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; else - return(AUTH_FATAL); + return AUTH_FATAL; } int @@ -83,10 +83,10 @@ securid_setup(pw, promptp, auth) if (sd_init(sd) == 0) { /* The programmer's guide says username is 32 bytes */ strlcpy(sd->username, pw->pw_name, 32); - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } else { warningx("unable to contact the SecurID server"); - return(AUTH_FATAL); + return AUTH_FATAL; } } @@ -102,7 +102,7 @@ securid_verify(pw, pass, auth) rval = sd_auth(sd); sd_close(); if (rval == ACM_OK) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; else - return(AUTH_FAILURE); + return AUTH_FAILURE; } diff --git a/auth/securid5.c b/auth/securid5.c index ef9e2283f..6880c1a1d 100644 --- a/auth/securid5.c +++ b/auth/securid5.c @@ -79,10 +79,10 @@ securid_init(pw, promptp, auth) /* Start communications */ if (AceInitialize() != SD_FALSE) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; warningx("failed to initialise the ACE API library"); - return(AUTH_FATAL); + return AUTH_FATAL; } /* @@ -110,7 +110,7 @@ securid_setup(pw, promptp, auth) /* Re-initialize SecurID every time. */ if (SD_Init(sd) != ACM_OK) { warningx("unable to contact the SecurID server"); - return(AUTH_FATAL); + return AUTH_FATAL; } /* Lock new PIN code */ @@ -119,23 +119,23 @@ securid_setup(pw, promptp, auth) switch (retval) { case ACM_OK: warningx("User ID locked for SecurID Authentication"); - return(AUTH_SUCCESS); + return AUTH_SUCCESS; case ACE_UNDEFINED_USERNAME: warningx("invalid username length for SecurID"); - return(AUTH_FATAL); + return AUTH_FATAL; case ACE_ERR_INVALID_HANDLE: warningx("invalid Authentication Handle for SecurID"); - return(AUTH_FATAL); + return AUTH_FATAL; case ACM_ACCESS_DENIED: warningx("SecurID communication failed"); - return(AUTH_FATAL); + return AUTH_FATAL; default: warningx("unknown SecurID error"); - return(AUTH_FATAL); + return AUTH_FATAL; } } @@ -228,5 +228,5 @@ then enter the new token code.\n", \ SD_Close(*sd); /* Return stored state to calling process */ - return(rval); + return rval; } diff --git a/auth/sia.c b/auth/sia.c index 188676a7a..6c972c635 100644 --- a/auth/sia.c +++ b/auth/sia.c @@ -101,11 +101,11 @@ sia_setup(pw, promptp, auth) log_error(USE_ERRNO|NO_EXIT|NO_MAIL, "unable to initialize SIA session"); - return(AUTH_FATAL); + return AUTH_FATAL; } auth->data = (void *) siah; - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } int @@ -120,9 +120,9 @@ sia_verify(pw, prompt, auth) /* XXX - need a way to detect user hitting return or EOF at prompt */ if (sia_ses_reauthent(sudo_collect, siah) == SIASUCCESS) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; else - return(AUTH_FAILURE); + return AUTH_FAILURE; } int @@ -133,5 +133,5 @@ sia_cleanup(pw, auth) SIAENTITY *siah = (SIAENTITY *) auth->data; (void) sia_ses_release(&siah); - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } diff --git a/bsm_audit.c b/bsm_audit.c index c66a8ce29..24dece07f 100644 --- a/bsm_audit.c +++ b/bsm_audit.c @@ -62,7 +62,7 @@ audit_sudo_selected(int sf) mask = &ainfo_addr.ai_mask; sorf = (sf == 0) ? AU_PRS_SUCCESS : AU_PRS_FAILURE; rc = au_preselect(AUE_sudo, mask, sorf, AU_PRS_REREAD); - return (rc); + return rc; } void diff --git a/check.c b/check.c index 461e238ab..be7d44ecb 100644 --- a/check.c +++ b/check.c @@ -367,7 +367,7 @@ expand_prompt(old_prompt, user, host) } else new_prompt = old_prompt; - return(new_prompt); + return new_prompt; oflow: /* We pre-allocate enough space, so this should never happen. */ @@ -381,8 +381,8 @@ int user_is_exempt() { if (!def_exempt_group) - return(FALSE); - return(user_in_group(sudo_user.pw, def_exempt_group)); + return FALSE; + return user_in_group(sudo_user.pw, def_exempt_group); } /* @@ -486,7 +486,7 @@ timestamp_status(timestampdir, timestampfile, user, flags) if (status == TS_ERROR) { if (timestamp_uid != 0) set_perms(PERM_ROOT); - return(status); + return status; } /* @@ -630,7 +630,7 @@ timestamp_status(timestampdir, timestampfile, user, flags) done: if (timestamp_uid != 0) set_perms(PERM_ROOT); - return(status); + return status; } /* @@ -732,5 +732,5 @@ get_authpw() pw = sudo_user.pw; } - return(pw); + return pw; } diff --git a/defaults.c b/defaults.c index cdf18e4ba..5f475df45 100644 --- a/defaults.c +++ b/defaults.c @@ -229,7 +229,7 @@ set_default(var, val, op) } if (!cur->name) { warningx("unknown defaults entry `%s'", var); - return(FALSE); + return FALSE; } switch (cur->type & T_MASK) { @@ -239,7 +239,7 @@ set_default(var, val, op) warningx("value `%s' is invalid for option `%s'", val, var); else warningx("no value specified for `%s'", var); - return(FALSE); + return FALSE; } break; case T_LOGPRI: @@ -248,7 +248,7 @@ set_default(var, val, op) warningx("value `%s' is invalid for option `%s'", val, var); else warningx("no value specified for `%s'", var); - return(FALSE); + return FALSE; } break; case T_STR: @@ -256,16 +256,16 @@ set_default(var, val, op) /* Check for bogus boolean usage or lack of a value. */ if (!ISSET(cur->type, T_BOOL) || op != FALSE) { warningx("no value specified for `%s'", var); - return(FALSE); + return FALSE; } } if (ISSET(cur->type, T_PATH) && val && *val != '/') { warningx("values for `%s' must start with a '/'", var); - return(FALSE); + return FALSE; } if (!store_str(val, cur, op)) { warningx("value `%s' is invalid for option `%s'", val, var); - return(FALSE); + return FALSE; } break; case T_INT: @@ -273,12 +273,12 @@ set_default(var, val, op) /* Check for bogus boolean usage or lack of a value. */ if (!ISSET(cur->type, T_BOOL) || op != FALSE) { warningx("no value specified for `%s'", var); - return(FALSE); + return FALSE; } } if (!store_int(val, cur, op)) { warningx("value `%s' is invalid for option `%s'", val, var); - return(FALSE); + return FALSE; } break; case T_UINT: @@ -286,12 +286,12 @@ set_default(var, val, op) /* Check for bogus boolean usage or lack of a value. */ if (!ISSET(cur->type, T_BOOL) || op != FALSE) { warningx("no value specified for `%s'", var); - return(FALSE); + return FALSE; } } if (!store_uint(val, cur, op)) { warningx("value `%s' is invalid for option `%s'", val, var); - return(FALSE); + return FALSE; } break; case T_FLOAT: @@ -299,12 +299,12 @@ set_default(var, val, op) /* Check for bogus boolean usage or lack of a value. */ if (!ISSET(cur->type, T_BOOL) || op != FALSE) { warningx("no value specified for `%s'", var); - return(FALSE); + return FALSE; } } if (!store_float(val, cur, op)) { warningx("value `%s' is invalid for option `%s'", val, var); - return(FALSE); + return FALSE; } break; case T_MODE: @@ -312,18 +312,18 @@ set_default(var, val, op) /* Check for bogus boolean usage or lack of a value. */ if (!ISSET(cur->type, T_BOOL) || op != FALSE) { warningx("no value specified for `%s'", var); - return(FALSE); + return FALSE; } } if (!store_mode(val, cur, op)) { warningx("value `%s' is invalid for option `%s'", val, var); - return(FALSE); + return FALSE; } break; case T_FLAG: if (val) { warningx("option `%s' does not take a value", var); - return(FALSE); + return FALSE; } cur->sd_un.flag = op; break; @@ -332,27 +332,27 @@ set_default(var, val, op) /* Check for bogus boolean usage or lack of a value. */ if (!ISSET(cur->type, T_BOOL) || op != FALSE) { warningx("no value specified for `%s'", var); - return(FALSE); + return FALSE; } } if (!store_list(val, cur, op)) { warningx("value `%s' is invalid for option `%s'", val, var); - return(FALSE); + return FALSE; } break; case T_TUPLE: if (!val && !ISSET(cur->type, T_BOOL)) { warningx("no value specified for `%s'", var); - return(FALSE); + return FALSE; } if (!store_tuple(val, cur, op)) { warningx("value `%s' is invalid for option `%s'", val, var); - return(FALSE); + return FALSE; } break; } - return(TRUE); + return TRUE; } /* @@ -547,7 +547,7 @@ update_defaults(what) break; } } - return(rc); + return rc; } static int @@ -564,13 +564,13 @@ store_int(val, def, op) } else { l = strtol(val, &endp, 10); if (*endp != '\0') - return(FALSE); + return FALSE; /* XXX - should check against INT_MAX */ def->sd_un.ival = (int)l; } if (def->callback) - return(def->callback(val)); - return(TRUE); + return def->callback(val); + return TRUE; } static int @@ -587,13 +587,13 @@ store_uint(val, def, op) } else { l = strtol(val, &endp, 10); if (*endp != '\0' || l < 0) - return(FALSE); + return FALSE; /* XXX - should check against INT_MAX */ def->sd_un.ival = (unsigned int)l; } if (def->callback) - return(def->callback(val)); - return(TRUE); + return def->callback(val); + return TRUE; } static int @@ -610,13 +610,13 @@ store_float(val, def, op) } else { d = strtod(val, &endp); if (*endp != '\0') - return(FALSE); + return FALSE; /* XXX - should check against HUGE_VAL */ def->sd_un.fval = d; } if (def->callback) - return(def->callback(val)); - return(TRUE); + return def->callback(val); + return TRUE; } static int @@ -644,11 +644,11 @@ store_tuple(val, def, op) } } if (v->sval == NULL) - return(FALSE); + return FALSE; } if (def->callback) - return(def->callback(val)); - return(TRUE); + return def->callback(val); + return TRUE; } static int @@ -664,8 +664,8 @@ store_str(val, def, op) else def->sd_un.str = estrdup(val); if (def->callback) - return(def->callback(val)); - return(TRUE); + return def->callback(val); + return TRUE; } static int @@ -696,7 +696,7 @@ store_list(str, def, op) list_op(start, end - start, def, op == '-' ? delete : add); } while (*end++ != '\0'); } - return(TRUE); + return TRUE; } static int @@ -709,21 +709,21 @@ store_syslogfac(val, def, op) if (op == FALSE) { def->sd_un.ival = FALSE; - return(TRUE); + return TRUE; } #ifdef LOG_NFACILITIES if (!val) - return(FALSE); + return FALSE; for (fac = facilities; fac->name && strcmp(val, fac->name); fac++) ; if (fac->name == NULL) - return(FALSE); /* not found */ + return FALSE; /* not found */ def->sd_un.ival = fac->num; #else def->sd_un.ival = -1; #endif /* LOG_NFACILITIES */ - return(TRUE); + return TRUE; } static const char * @@ -735,9 +735,9 @@ logfac2str(n) for (fac = facilities; fac->name && fac->num != n; fac++) ; - return(fac->name); + return fac->name; #else - return("default"); + return "default"; #endif /* LOG_NFACILITIES */ } @@ -750,15 +750,15 @@ store_syslogpri(val, def, op) struct strmap *pri; if (op == FALSE || !val) - return(FALSE); + return FALSE; for (pri = priorities; pri->name && strcmp(val, pri->name); pri++) ; if (pri->name == NULL) - return(FALSE); /* not found */ + return FALSE; /* not found */ def->sd_un.ival = pri->num; - return(TRUE); + return TRUE; } static const char * @@ -769,7 +769,7 @@ logpri2str(n) for (pri = priorities; pri->name && pri->num != n; pri++) ; - return(pri->name); + return pri->name; } static int @@ -786,12 +786,12 @@ store_mode(val, def, op) } else { l = strtol(val, &endp, 8); if (*endp != '\0' || l < 0 || l > 0777) - return(FALSE); + return FALSE; def->sd_un.mode = (mode_t)l; } if (def->callback) - return(def->callback(val)); - return(TRUE); + return def->callback(val); + return TRUE; } static void diff --git a/env.c b/env.c index c26e0e041..654565edc 100644 --- a/env.c +++ b/env.c @@ -314,7 +314,7 @@ setenv(var, val, overwrite) if (!var || *var == '\0') { errno = EINVAL; - return(-1); + return -1; } if (env.envp == NULL) @@ -347,7 +347,7 @@ setenv(var, val, overwrite) errorx(1, "setenv: corrupted envp, len mismatch"); #endif sudo_putenv(estring, TRUE, overwrite); - return(0); + return 0; } /* @@ -369,7 +369,7 @@ unsetenv(var) #ifdef UNSETENV_VOID return; #else - return(-1); + return -1; #endif } @@ -395,7 +395,7 @@ unsetenv(var) } env.env_len = ep - env.envp; #ifndef UNSETENV_VOID - return(0); + return 0; #endif } @@ -415,14 +415,14 @@ putenv(string) if (strchr(string, '=') == NULL) { errno = EINVAL; - return(-1); + return -1; } #ifdef ENV_DEBUG if (env.envp[env.env_len] != NULL) errorx(1, "putenv: corrupted envp, len mismatch"); #endif sudo_putenv((char *)string, TRUE, TRUE); - return(0); + return 0; } /* @@ -523,7 +523,7 @@ matches_env_delete(var) break; } } - return(match); + return match; } /* @@ -553,7 +553,7 @@ matches_env_check(var) break; } } - return(keepit); + return keepit; } /* @@ -582,7 +582,7 @@ matches_env_keep(var) break; } } - return(keepit); + return keepit; } /* diff --git a/exec.c b/exec.c index 72f382672..5b3b3d707 100644 --- a/exec.c +++ b/exec.c @@ -216,7 +216,7 @@ sudo_execve(path, argv, envp, uid, cstat, dowait, bgmode) my_execve(path, argv, envp); cstat->type = CMD_ERRNO; cstat->val = errno; - return(127); + return 127; } /* diff --git a/exec_pty.c b/exec_pty.c index 361156f19..4985ff0b2 100644 --- a/exec_pty.c +++ b/exec_pty.c @@ -217,7 +217,7 @@ suspend_parent(signo) break; } - return(rval); + return rval; } /* diff --git a/fileops.c b/fileops.c index 5ef3cf30e..3a509396f 100644 --- a/fileops.c +++ b/fileops.c @@ -71,13 +71,13 @@ touch(fd, path, tvp) #if defined(HAVE_FUTIME) || defined(HAVE_FUTIMES) if (fd != -1) - return(futimes(fd, tvp ? times : NULL)); + return futimes(fd, tvp ? times : NULL); else #endif if (path != NULL) - return(utimes(path, tvp ? times : NULL)); + return utimes(path, tvp ? times : NULL); else - return(-1); + return -1; } /* @@ -102,7 +102,7 @@ lock_file(fd, lockit) op = F_ULOCK; break; } - return(lockf(fd, op, 0) == 0); + return lockf(fd, op, 0) == 0; } #elif HAVE_FLOCK int @@ -123,7 +123,7 @@ lock_file(fd, lockit) op = LOCK_UN; break; } - return(flock(fd, op) == 0); + return flock(fd, op) == 0; } #else int @@ -142,9 +142,9 @@ lock_file(fd, lockit) lock.l_whence = SEEK_SET; func = (lockit == SUDO_LOCK) ? F_SETLKW : F_SETLK; - return(fcntl(fd, func, &lock) == 0); + return fcntl(fd, func, &lock) == 0; #else - return(TRUE); + return TRUE; #endif } #endif @@ -173,5 +173,5 @@ sudo_parseln(fp) for (cp = buf; isblank((unsigned char)*cp); cp++) continue; } - return(cp); + return cp; } diff --git a/find_path.c b/find_path.c index 78c96eaa7..fb7fb5f86 100644 --- a/find_path.c +++ b/find_path.c @@ -78,13 +78,13 @@ find_path(infile, outfile, sbp, path, ignore_dot) strlcpy(command, infile, sizeof(command)); /* paranoia */ if (sudo_goodpath(command, sbp)) { *outfile = command; - return(FOUND); + return FOUND; } else - return(NOT_FOUND); + return NOT_FOUND; } if (path == NULL) - return(NOT_FOUND); + return NOT_FOUND; path = estrdup(path); origpath = path; @@ -125,12 +125,12 @@ find_path(infile, outfile, sbp, path, ignore_dot) errorx(1, "%s: File name too long", infile); result = sudo_goodpath(command, sbp); if (result && ignore_dot) - return(NOT_FOUND_DOT); + return NOT_FOUND_DOT; } if (result) { *outfile = result; - return(FOUND); + return FOUND; } else - return(NOT_FOUND); + return NOT_FOUND; } diff --git a/fnmatch.c b/fnmatch.c index 1025c2f34..a580cf667 100644 --- a/fnmatch.c +++ b/fnmatch.c @@ -80,17 +80,17 @@ fnmatch(pattern, string, flags) switch (c = *pattern++) { case EOS: if (ISSET(flags, FNM_LEADING_DIR) && *string == '/') - return (0); - return (*string == EOS ? 0 : FNM_NOMATCH); + return 0; + return *string == EOS ? 0 : FNM_NOMATCH; case '?': if (*string == EOS) - return (FNM_NOMATCH); + return FNM_NOMATCH; if (*string == '/' && ISSET(flags, FNM_PATHNAME)) - return (FNM_NOMATCH); + return FNM_NOMATCH; if (*string == '.' && ISSET(flags, FNM_PERIOD) && (string == stringstart || (ISSET(flags, FNM_PATHNAME) && *(string - 1) == '/'))) - return (FNM_NOMATCH); + return FNM_NOMATCH; ++string; break; case '*': @@ -102,40 +102,40 @@ fnmatch(pattern, string, flags) if (*string == '.' && ISSET(flags, FNM_PERIOD) && (string == stringstart || (ISSET(flags, FNM_PATHNAME) && *(string - 1) == '/'))) - return (FNM_NOMATCH); + return FNM_NOMATCH; /* Optimize for pattern with * at end or before /. */ if (c == EOS) { if (ISSET(flags, FNM_PATHNAME)) - return (ISSET(flags, FNM_LEADING_DIR) || + return ISSET(flags, FNM_LEADING_DIR) || strchr(string, '/') == NULL ? - 0 : FNM_NOMATCH); + 0 : FNM_NOMATCH; else - return (0); + return 0; } else if (c == '/' && ISSET(flags, FNM_PATHNAME)) { if ((string = strchr(string, '/')) == NULL) - return (FNM_NOMATCH); + return FNM_NOMATCH; break; } /* General case, use recursion. */ while ((test = *string) != EOS) { if (!fnmatch(pattern, string, flags & ~FNM_PERIOD)) - return (0); + return 0; if (test == '/' && ISSET(flags, FNM_PATHNAME)) break; ++string; } - return (FNM_NOMATCH); + return FNM_NOMATCH; case '[': if (*string == EOS) - return (FNM_NOMATCH); + return FNM_NOMATCH; if (*string == '/' && ISSET(flags, FNM_PATHNAME)) - return (FNM_NOMATCH); + return FNM_NOMATCH; if (*string == '.' && ISSET(flags, FNM_PERIOD) && (string == stringstart || (ISSET(flags, FNM_PATHNAME) && *(string - 1) == '/'))) - return (FNM_NOMATCH); + return FNM_NOMATCH; switch (rangematch(pattern, *string, flags, &newp)) { case RANGE_ERROR: @@ -145,7 +145,7 @@ fnmatch(pattern, string, flags) pattern = newp; break; case RANGE_NOMATCH: - return (FNM_NOMATCH); + return FNM_NOMATCH; } ++string; break; @@ -162,7 +162,7 @@ fnmatch(pattern, string, flags) if (c != *string && !(ISSET(flags, FNM_CASEFOLD) && (tolower((unsigned char)c) == tolower((unsigned char)*string)))) - return (FNM_NOMATCH); + return FNM_NOMATCH; ++string; break; } @@ -218,9 +218,9 @@ rangematch(pattern, test, flags, newp) if (c == '\\' && !ISSET(flags, FNM_NOESCAPE)) c = *pattern++; if (c == EOS) - return (RANGE_ERROR); + return RANGE_ERROR; if (c == '/' && ISSET(flags, FNM_PATHNAME)) - return (RANGE_NOMATCH); + return RANGE_NOMATCH; if (ISSET(flags, FNM_CASEFOLD)) c = tolower((unsigned char)c); if (*pattern == '-' @@ -229,7 +229,7 @@ rangematch(pattern, test, flags, newp) if (c2 == '\\' && !ISSET(flags, FNM_NOESCAPE)) c2 = *pattern++; if (c2 == EOS) - return (RANGE_ERROR); + return RANGE_ERROR; if (ISSET(flags, FNM_CASEFOLD)) c2 = tolower((unsigned char)c2); if (c <= test && test <= c2) @@ -239,7 +239,7 @@ rangematch(pattern, test, flags, newp) } while ((c = *pattern++) != ']'); *newp = (char *)pattern; - return (ok == negate ? RANGE_NOMATCH : RANGE_MATCH); + return ok == negate ? RANGE_NOMATCH : RANGE_MATCH; } static int @@ -260,7 +260,7 @@ classmatch(pattern, test, foldcase, ep) if ((colon = strchr(pattern, ':')) == NULL || colon[1] != ']') { *ep = pattern - 2; - return(RANGE_ERROR); + return RANGE_ERROR; } *ep = colon + 2; len = (size_t)(colon - pattern); @@ -279,5 +279,5 @@ classmatch(pattern, test, foldcase, ep) *ep = colon + strlen(colon); rval = RANGE_ERROR; } - return(rval); + return rval; } diff --git a/get_pty.c b/get_pty.c index 8ec1dbae2..854979428 100644 --- a/get_pty.c +++ b/get_pty.c @@ -73,10 +73,10 @@ get_pty(master, slave, name, namesz, ttyuid) } if (openpty(master, slave, name, NULL, NULL) != 0) - return(0); + return 0; if (chown(name, ttyuid, ttygid) != 0) - return(0); - return(1); + return 0; + return 1; } #elif defined(HAVE__GETPTY) @@ -93,15 +93,15 @@ get_pty(master, slave, name, namesz, ttyuid) /* IRIX-style dynamic ptys (may fork) */ line = _getpty(master, O_RDWR, S_IRUSR|S_IWUSR|S_IWGRP, 0); if (line == NULL) - return (0); + return 0; *slave = open(line, O_RDWR|O_NOCTTY, 0); if (*slave == -1) { close(*master); - return(0); + return 0; } (void) chown(line, ttyuid, -1); strlcpy(name, line, namesz); - return(1); + return 1; } #elif defined(HAVE_GRANTPT) # ifndef HAVE_POSIX_OPENPT @@ -116,7 +116,7 @@ posix_openpt(oflag) # else fd = open("/dev/ptmx", oflag); # endif - return(fd); + return fd; } # endif /* HAVE_POSIX_OPENPT */ @@ -132,22 +132,22 @@ get_pty(master, slave, name, namesz, ttyuid) *master = posix_openpt(O_RDWR|O_NOCTTY); if (*master == -1) - return(0); + return 0; (void) grantpt(*master); /* may fork */ if (unlockpt(*master) != 0) { close(*master); - return(0); + return 0; } line = ptsname(*master); if (line == NULL) { close(*master); - return(0); + return 0; } *slave = open(line, O_RDWR|O_NOCTTY, 0); if (*slave == -1) { close(*master); - return(0); + return 0; } # if defined(I_PUSH) && !defined(_AIX) ioctl(*slave, I_PUSH, "ptem"); /* pseudo tty emulation module */ @@ -155,7 +155,7 @@ get_pty(master, slave, name, namesz, ttyuid) # endif (void) chown(line, ttyuid, -1); strlcpy(name, line, namesz); - return(1); + return 1; } #else /* Old-style BSD ptys */ @@ -184,7 +184,7 @@ get_pty(master, slave, name, namesz, ttyuid) *master = open(line, O_RDWR|O_NOCTTY, 0); if (*master == -1) { if (errno == ENOENT) - return(0); /* out of ptys */ + return 0; /* out of ptys */ continue; /* already in use */ } line[sizeof("/dev/p") - 2] = 't'; @@ -196,11 +196,11 @@ get_pty(master, slave, name, namesz, ttyuid) *slave = open(line, O_RDWR|O_NOCTTY, 0); if (*slave != -1) { strlcpy(name, line, namesz); - return(1); /* success */ + return 1; /* success */ } (void) close(*master); } } - return(0); + return 0; } #endif /* HAVE_OPENPTY */ diff --git a/getcwd.c b/getcwd.c index 0bbb86fc8..b2917c16f 100644 --- a/getcwd.c +++ b/getcwd.c @@ -104,12 +104,12 @@ getcwd(pt, size) ptsize = 0; if (!size) { errno = EINVAL; - return (NULL); + return NULL; } ept = pt + size; } else { if ((pt = malloc(ptsize = 1024 - 4)) == NULL) - return (NULL); + return NULL; ept = pt + ptsize; } bpt = ept - 1; @@ -154,7 +154,7 @@ getcwd(pt, size) */ bcopy(bpt, pt, ept - bpt); free(up); - return (pt); + return pt; } /* @@ -262,5 +262,5 @@ err: free(up); if (dir) (void)closedir(dir); - return (NULL); + return NULL; } diff --git a/getline.c b/getline.c index 83a325f39..2b3d32464 100644 --- a/getline.c +++ b/getline.c @@ -64,7 +64,7 @@ getline(bufp, bufsizep, fp) memcpy(*bufp, buf, len); (*bufp)[len] = '\0'; } - return(buf ? len : -1); + return buf ? len : -1; } #else ssize_t @@ -97,6 +97,6 @@ getline(bufp, bufsizep, fp) } *bufp = buf; *bufsizep = bufsize; - return(len); + return len; } #endif diff --git a/getprogname.c b/getprogname.c index ab04a7ce2..113f8d252 100644 --- a/getprogname.c +++ b/getprogname.c @@ -41,5 +41,5 @@ getprogname() else progname = Argv[0]; } - return(progname); + return progname; } diff --git a/getspwuid.c b/getspwuid.c index 7ee5ebaf8..a94f47e23 100644 --- a/getspwuid.c +++ b/getspwuid.c @@ -87,11 +87,11 @@ sudo_getepw(pw) /* If there is a function to check for shadow enabled, use it... */ #ifdef HAVE_ISCOMSEC if (!iscomsec()) - return(estrdup(pw->pw_passwd)); + return estrdup(pw->pw_passwd); #endif /* HAVE_ISCOMSEC */ #ifdef HAVE_ISSECURE if (!issecure()) - return(estrdup(pw->pw_passwd)); + return estrdup(pw->pw_passwd); #endif /* HAVE_ISSECURE */ epw = NULL; @@ -106,7 +106,7 @@ sudo_getepw(pw) epw = estrdup(spw->ufld.fd_encrypt); } if (epw) - return(epw); + return epw; } #endif /* HAVE_GETPRPWNAM */ #ifdef HAVE_GETSPNAM @@ -116,7 +116,7 @@ sudo_getepw(pw) if ((spw = getspnam(pw->pw_name)) && spw->sp_pwdp) epw = estrdup(spw->sp_pwdp); if (epw) - return(epw); + return epw; } #endif /* HAVE_GETSPNAM */ #ifdef HAVE_GETSPWUID @@ -126,7 +126,7 @@ sudo_getepw(pw) if ((spw = getspwuid(pw->pw_uid)) && spw->pw_passwd) epw = estrdup(spw->pw_passwd); if (epw) - return(epw); + return epw; } #endif /* HAVE_GETSPWUID */ #ifdef HAVE_GETPWANAM @@ -136,7 +136,7 @@ sudo_getepw(pw) if ((spw = getpwanam(pw->pw_name)) && spw->pwa_passwd) epw = estrdup(spw->pwa_passwd); if (epw) - return(epw); + return epw; } #endif /* HAVE_GETPWANAM */ #ifdef HAVE_GETAUTHUID @@ -146,12 +146,12 @@ sudo_getepw(pw) if ((spw = getauthuid(pw->pw_uid)) && spw->a_password) epw = estrdup(spw->a_password); if (epw) - return(epw); + return epw; } #endif /* HAVE_GETAUTHUID */ /* Fall back on normal password. */ - return(estrdup(pw->pw_passwd)); + return estrdup(pw->pw_passwd); } void diff --git a/gettime.c b/gettime.c index 656b3ec07..c605da3af 100644 --- a/gettime.c +++ b/gettime.c @@ -41,5 +41,5 @@ gettime(tv) rval = (int)time(&tv->tv_sec); tv->tv_usec = 0; #endif - return (rval); + return rval; } diff --git a/glob.c b/glob.c index 876eee6ae..dba446465 100644 --- a/glob.c +++ b/glob.c @@ -554,7 +554,7 @@ glob0(pattern, pglob) #endif if ((err = glob1(patbuf, patbuf + PATH_MAX - 1, pglob)) != 0) - return(err); + return err; /* * If there was no match we are going to append the pattern @@ -562,21 +562,21 @@ glob0(pattern, pglob) */ if (pglob->gl_pathc == oldpathc) { if (pglob->gl_flags & GLOB_NOCHECK) - return(globextend(pattern, pglob)); + return globextend(pattern, pglob); else - return(GLOB_NOMATCH); + return GLOB_NOMATCH; } if (!(pglob->gl_flags & GLOB_NOSORT)) qsort(pglob->gl_pathv + pglob->gl_offs + oldpathc, pglob->gl_pathc - oldpathc, sizeof(char *), compare); - return(0); + return 0; } static int compare(p, q) const void *p, *q; { - return(strcmp(*(char **)p, *(char **)q)); + return strcmp(*(char **)p, *(char **)q); } static int @@ -588,10 +588,10 @@ glob1(pattern, pattern_last, pglob) /* A null pathname is invalid -- POSIX 1003.1 sect. 2.4. */ if (*pattern == EOS) - return(0); - return(glob2(pathbuf, pathbuf + PATH_MAX - 1, + return 0; + return glob2(pathbuf, pathbuf + PATH_MAX - 1, pathbuf, pathbuf + PATH_MAX - 1, - pattern, pattern_last, pglob)); + pattern, pattern_last, pglob); } /* @@ -618,7 +618,7 @@ glob2(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last, pglob if (*pattern == EOS) { /* End of pattern? */ *pathend = EOS; if (g_lstat(pathbuf, &sb, pglob)) - return(0); + return 0; if (((pglob->gl_flags & GLOB_MARK) && pathend[-1] != SEP) && (S_ISDIR(sb.st_mode) || @@ -626,12 +626,12 @@ glob2(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last, pglob (g_stat(pathbuf, &sb, pglob) == 0) && S_ISDIR(sb.st_mode)))) { if (pathend+1 > pathend_last) - return (1); + return 1; *pathend++ = SEP; *pathend = EOS; } ++pglob->gl_matchc; - return(globextend(pathbuf, pglob)); + return globextend(pathbuf, pglob); } /* Find end of next segment, copy tentatively to pathend. */ @@ -641,7 +641,7 @@ glob2(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last, pglob if (ismeta(*p)) anymeta = 1; if (q+1 > pathend_last) - return (1); + return 1; *q++ = *p++; } @@ -650,14 +650,14 @@ glob2(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last, pglob pattern = p; while (*pattern == SEP) { if (pathend+1 > pathend_last) - return (1); + return 1; *pathend++ = *pattern++; } } else /* Need expansion, recurse. */ - return(glob3(pathbuf, pathbuf_last, pathend, + return glob3(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last, - p, pattern_last, pglob)); + p, pattern_last, pglob); } /* NOTREACHED */ } @@ -675,7 +675,7 @@ glob3(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last, char buf[PATH_MAX]; if (pathend > pathend_last) - return (1); + return 1; *pathend = EOS; errno = 0; @@ -683,12 +683,12 @@ glob3(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last, /* TODO: don't call for ENOENT or ENOTDIR? */ if (pglob->gl_errfunc) { if (g_Ctoc(pathbuf, buf, sizeof(buf))) - return(GLOB_ABORTED); + return GLOB_ABORTED; if (pglob->gl_errfunc(buf, errno) || pglob->gl_flags & GLOB_ERR) - return(GLOB_ABORTED); + return GLOB_ABORTED; } - return(0); + return 0; } err = 0; @@ -722,7 +722,7 @@ glob3(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last, } closedir(dirp); - return(err); + return err; } /* @@ -759,7 +759,7 @@ globextend(path, pglob) free(pglob->gl_pathv); pglob->gl_pathv = NULL; } - return(GLOB_NOSPACE); + return GLOB_NOSPACE; } if (pglob->gl_pathv == NULL && pglob->gl_offs > 0) { @@ -776,13 +776,13 @@ globextend(path, pglob) if ((copy = malloc(len)) != NULL) { if (g_Ctoc(path, copy, len)) { free(copy); - return(GLOB_NOSPACE); + return GLOB_NOSPACE; } pathv[pglob->gl_offs + pglob->gl_pathc++] = copy; } pathv[pglob->gl_offs + pglob->gl_pathc] = NULL; - return(copy == NULL ? GLOB_NOSPACE : 0); + return copy == NULL ? GLOB_NOSPACE : 0; } /* @@ -801,20 +801,20 @@ match(name, pat, patend) switch (c & M_MASK) { case M_ALL: if (pat == patend) - return(1); + return 1; do { if (match(name, pat, patend)) - return(1); + return 1; } while (*name++ != EOS); - return(0); + return 0; case M_ONE: if (*name++ == EOS) - return(0); + return 0; break; case M_SET: ok = 0; if ((k = *name++) == EOS) - return(0); + return 0; if ((negate_range = ((*pat & M_MASK) == M_NOT)) != EOS) ++pat; while (((c = *pat++) & M_MASK) != M_END) { @@ -833,15 +833,15 @@ match(name, pat, patend) ok = 1; } if (ok == negate_range) - return(0); + return 0; break; default: if (*name++ != c) - return(0); + return 0; break; } } - return(*name == EOS); + return *name == EOS; } /* Free allocated data belonging to a glob_t structure. */ @@ -874,9 +874,9 @@ g_opendir(str, pglob) buf[1] = '\0'; } else { if (g_Ctoc(str, buf, sizeof(buf))) - return(NULL); + return NULL; } - return(opendir(buf)); + return opendir(buf); } static int @@ -888,8 +888,8 @@ g_lstat(fn, sb, pglob) char buf[PATH_MAX]; if (g_Ctoc(fn, buf, sizeof(buf))) - return(-1); - return(lstat(buf, sb)); + return -1; + return lstat(buf, sb); } static int @@ -901,8 +901,8 @@ g_stat(fn, sb, pglob) char buf[PATH_MAX]; if (g_Ctoc(fn, buf, sizeof(buf))) - return(-1); - return(stat(buf, sb)); + return -1; + return stat(buf, sb); } static Char * @@ -912,9 +912,9 @@ g_strchr(str, ch) { do { if (*str == ch) - return ((Char *)str); + return (Char *)str; } while (*str++); - return (NULL); + return NULL; } static int @@ -926,9 +926,9 @@ g_Ctoc(str, buf, len) while (len--) { if ((*buf++ = *str++) == EOS) - return (0); + return 0; } - return (1); + return 1; } #ifdef DEBUG diff --git a/goodpath.c b/goodpath.c index 197131427..45066d3c6 100644 --- a/goodpath.c +++ b/goodpath.c @@ -50,18 +50,18 @@ sudo_goodpath(path, sbp) /* Check for brain damage */ if (path == NULL || path[0] == '\0') - return(NULL); + return NULL; if (stat(path, &sb)) - return(NULL); + return NULL; /* Make sure path describes an executable regular file. */ if (!S_ISREG(sb.st_mode) || !(sb.st_mode & 0000111)) { errno = EACCES; - return(NULL); + return NULL; } if (sbp != NULL) (void) memcpy(sbp, &sb, sizeof(struct stat)); - return((char *)path); + return (char *)path; } diff --git a/gram.c b/gram.c index d016a0fd4..78783b2f2 100644 --- a/gram.c +++ b/gram.c @@ -651,7 +651,7 @@ new_default(var, val, op) d->prev = d; d->next = NULL; - return(d); + return d; } static struct member * @@ -667,7 +667,7 @@ new_member(name, type) m->prev = m; m->next = NULL; - return(m); + return m; } /* diff --git a/gram.y b/gram.y index f319eea4f..2285b7854 100644 --- a/gram.y +++ b/gram.y @@ -620,7 +620,7 @@ new_default(var, val, op) d->prev = d; d->next = NULL; - return(d); + return d; } static struct member * @@ -636,7 +636,7 @@ new_member(name, type) m->prev = m; m->next = NULL; - return(m); + return m; } /* diff --git a/iolog.c b/iolog.c index e15b51dcc..f80312d2f 100644 --- a/iolog.c +++ b/iolog.c @@ -187,7 +187,7 @@ build_idpath(pathbuf, pathsize) pathbuf[len - i] = '/'; } - return(len); + return len; } static void * diff --git a/isblank.c b/isblank.c index 78f373937..a12547c73 100644 --- a/isblank.c +++ b/isblank.c @@ -23,5 +23,5 @@ int isblank(ch) int ch; { - return(ch == ' ' || ch == '\t'); + return ch == ' ' || ch == '\t'; } diff --git a/lbuf.c b/lbuf.c index 78c16adcb..b0fc2e4fd 100644 --- a/lbuf.c +++ b/lbuf.c @@ -70,13 +70,13 @@ get_ttycols() struct winsize wsize; if (ioctl(STDERR_FILENO, TIOCGWINSZ, &wsize) == 0 && wsize.ws_col != 0) - return((int)wsize.ws_col); + return (int)wsize.ws_col; #endif /* Fall back on $COLUMNS. */ if ((p = getenv("COLUMNS")) == NULL || (cols = atoi(p)) <= 0) cols = 80; - return(cols); + return cols; } void diff --git a/ldap.c b/ldap.c index 8adb43568..f6542bceb 100644 --- a/ldap.c +++ b/ldap.c @@ -467,7 +467,7 @@ sudo_ldap_parse_uri(uri_list) done: efree(buf); - return(rc); + return rc; toobig: errorx(1, "sudo_ldap_parse_uri: out of space building hostbuf"); @@ -483,7 +483,7 @@ sudo_ldap_join_uri(uri_list) /* Usually just a single entry. */ if (uri_list->next == NULL) - return(estrdup(uri_list->val)); + return estrdup(uri_list->val); for (uri = uri_list; uri != NULL; uri = uri->next) { len += strlen(uri->val) + 1; @@ -495,7 +495,7 @@ sudo_ldap_join_uri(uri_list) *cp++ = ' '; } cp[-1] = '\0'; - return(buf); + return buf; } #endif /* HAVE_LDAP_INITIALIZE */ @@ -564,7 +564,7 @@ sudo_ldap_init(ldp, host, port) done: *ldp = ld; - return(rc); + return rc; } /* @@ -582,12 +582,12 @@ sudo_ldap_check_user_netgroup(ld, entry, user) int ret = FALSE; if (!entry) - return(ret); + return ret; /* get the values from the entry */ bv = ldap_get_values_len(ld, entry, "sudoUser"); if (bv == NULL) - return(ret); + return ret; /* walk through values */ for (p = bv; *p != NULL && !ret; p++) { @@ -601,7 +601,7 @@ sudo_ldap_check_user_netgroup(ld, entry, user) ldap_value_free_len(bv); /* cleanup */ - return(ret); + return ret; } /* @@ -618,12 +618,12 @@ sudo_ldap_check_host(ld, entry) int ret = FALSE; if (!entry) - return(ret); + return ret; /* get the values from the entry */ bv = ldap_get_values_len(ld, entry, "sudoHost"); if (bv == NULL) - return(ret); + return ret; /* walk through values */ for (p = bv; *p != NULL && !ret; p++) { @@ -639,7 +639,7 @@ sudo_ldap_check_host(ld, entry) ldap_value_free_len(bv); /* cleanup */ - return(ret); + return ret; } static int @@ -652,7 +652,7 @@ sudo_ldap_check_runas_user(ld, entry) int ret = FALSE; if (!runas_pw) - return(UNSPEC); + return UNSPEC; /* get the runas user from the entry */ bv = ldap_get_values_len(ld, entry, "sudoRunAsUser"); @@ -681,7 +681,7 @@ sudo_ldap_check_runas_user(ld, entry) * what the user specified on the command line. */ if (bv == NULL) - return(!strcasecmp(runas_pw->pw_name, def_runas_default)); + return !strcasecmp(runas_pw->pw_name, def_runas_default); /* walk through values returned, looking for a match */ for (p = bv; *p != NULL && !ret; p++) { @@ -712,7 +712,7 @@ sudo_ldap_check_runas_user(ld, entry) ldap_value_free_len(bv); /* cleanup */ - return(ret); + return ret; } static int @@ -726,12 +726,12 @@ sudo_ldap_check_runas_group(ld, entry) /* runas_gr is only set if the user specified the -g flag */ if (!runas_gr) - return(UNSPEC); + return UNSPEC; /* get the values from the entry */ bv = ldap_get_values_len(ld, entry, "sudoRunAsGroup"); if (bv == NULL) - return(ret); + return ret; /* walk through values returned, looking for a match */ for (p = bv; *p != NULL && !ret; p++) { @@ -744,7 +744,7 @@ sudo_ldap_check_runas_group(ld, entry) ldap_value_free_len(bv); /* cleanup */ - return(ret); + return ret; } /* @@ -759,12 +759,12 @@ sudo_ldap_check_runas(ld, entry) int ret; if (!entry) - return(FALSE); + return FALSE; ret = sudo_ldap_check_runas_user(ld, entry) != FALSE && sudo_ldap_check_runas_group(ld, entry) != FALSE; - return(ret); + return ret; } /* @@ -782,11 +782,11 @@ sudo_ldap_check_command(ld, entry, setenv_implied) int foundbang, ret = UNSPEC; if (!entry) - return(ret); + return ret; bv = ldap_get_values_len(ld, entry, "sudoCommand"); if (bv == NULL) - return(ret); + return ret; for (p = bv; *p != NULL && ret != FALSE; p++) { val = (*p)->bv_val; @@ -829,7 +829,7 @@ sudo_ldap_check_command(ld, entry, setenv_implied) ldap_value_free_len(bv); /* more cleanup */ - return(ret); + return ret; } /* @@ -847,11 +847,11 @@ sudo_ldap_check_bool(ld, entry, option) int ret = UNSPEC; if (entry == NULL) - return(UNSPEC); + return UNSPEC; bv = ldap_get_values_len(ld, entry, "sudoOption"); if (bv == NULL) - return(ret); + return ret; /* walk through options */ for (p = bv; *p != NULL; p++) { @@ -866,7 +866,7 @@ sudo_ldap_check_bool(ld, entry, option) ldap_value_free_len(bv); - return(ret); + return ret; } /* @@ -973,7 +973,7 @@ sudo_ldap_timefilter(buffer, buffersize) } done: - return(bytes); + return bytes; } /* @@ -1055,7 +1055,7 @@ sudo_ldap_build_pass1(pw) } strlcat(buf, ")", sz); /* closes the global OR or the global AND */ - return(buf); + return buf; } /* @@ -1078,7 +1078,7 @@ sudo_ldap_build_pass2() buf = estrdup("sudoUser=+*"); } - return(buf); + return buf; } /* @@ -1092,32 +1092,32 @@ _atobool(s) case 'y': case 'Y': if (strcasecmp(s, "yes") == 0) - return(TRUE); + return TRUE; break; case 't': case 'T': if (strcasecmp(s, "true") == 0) - return(TRUE); + return TRUE; break; case 'o': case 'O': if (strcasecmp(s, "on") == 0) - return(TRUE); + return TRUE; if (strcasecmp(s, "off") == 0) - return(FALSE); + return FALSE; break; case 'n': case 'N': if (strcasecmp(s, "no") == 0) - return(FALSE); + return FALSE; break; case 'f': case 'F': if (strcasecmp(s, "false") == 0) - return(FALSE); + return FALSE; break; } - return(-1); + return -1; } static void @@ -1160,7 +1160,7 @@ sudo_ldap_read_config() ldap_conf.rootuse_sasl = -1; if ((fp = fopen(_PATH_LDAP_CONF, "r")) == NULL) - return(FALSE); + return FALSE; while ((cp = sudo_parseln(fp)) != NULL) { if (*cp == '\0') @@ -1287,7 +1287,7 @@ sudo_ldap_read_config() fprintf(stderr, "===================\n"); } if (!ldap_conf.base) - return(FALSE); /* if no base is defined, ignore LDAP */ + return FALSE; /* if no base is defined, ignore LDAP */ if (ldap_conf.bind_timelimit > 0) ldap_conf.bind_timelimit *= 1000; /* convert to ms */ @@ -1314,7 +1314,7 @@ sudo_ldap_read_config() if (ldap_conf.uri) { struct ldap_config_list_str *uri = ldap_conf.uri; if (sudo_ldap_parse_uri(uri) != 0) - return(FALSE); + return FALSE; do { ldap_conf.uri = uri->next; efree(uri); @@ -1364,7 +1364,7 @@ sudo_ldap_read_config() } } #endif - return(TRUE); + return TRUE; } /* @@ -1380,21 +1380,21 @@ sudo_ldap_get_first_rdn(ld, entry) LDAPDN tmpDN; if ((dn = ldap_get_dn(ld, entry)) == NULL) - return(NULL); + return NULL; if (ldap_str2dn(dn, &tmpDN, LDAP_DN_FORMAT_LDAP) == LDAP_SUCCESS) { ldap_rdn2str(tmpDN[0], &rdn, LDAP_DN_FORMAT_UFN); ldap_dnfree(tmpDN); } ldap_memfree(dn); - return(rdn); + return rdn; #else char *dn, **edn; if ((dn = ldap_get_dn(ld, entry)) == NULL) - return(NULL); + return NULL; edn = ldap_explode_dn(dn, 1); ldap_memfree(dn); - return(edn ? edn[0] : NULL); + return edn ? edn[0] : NULL; #endif } @@ -1448,7 +1448,7 @@ sudo_ldap_display_defaults(nss, pw, lbuf) ldap_msgfree(result); } done: - return(count); + return count; } /* @@ -1460,7 +1460,7 @@ sudo_ldap_display_bound_defaults(nss, pw, lbuf) struct passwd *pw; struct lbuf *lbuf; { - return(0); + return 0; } /* @@ -1542,7 +1542,7 @@ sudo_ldap_display_entry_short(ld, entry, lbuf) } lbuf_append(lbuf, "\n", NULL); - return(count); + return count; } /* @@ -1629,7 +1629,7 @@ sudo_ldap_display_entry_long(ld, entry, lbuf) ldap_value_free_len(bv); } - return(count); + return count; } /* @@ -1664,7 +1664,7 @@ sudo_ldap_display_privs(nss, pw, lbuf) } done: - return(count); + return count; } static int @@ -1701,7 +1701,7 @@ done: if (found) printf("%s%s%s\n", safe_cmnd ? safe_cmnd : user_cmnd, user_args ? " " : "", user_args ? user_args : ""); - return(!found); + return !found; } #ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND_S @@ -1717,7 +1717,7 @@ sudo_ldap_sasl_interact(ld, flags, _auth_id, _interact) for (; interact->id != SASL_CB_LIST_END; interact++) { if (interact->id != SASL_CB_USER) - return(LDAP_PARAM_ERROR); + return LDAP_PARAM_ERROR; if (auth_id != NULL) interact->result = auth_id; @@ -1731,7 +1731,7 @@ sudo_ldap_sasl_interact(ld, flags, _auth_id, _interact) interact->result = estrdup(interact->result); #endif /* SASL_VERSION_MAJOR < 2 */ } - return(LDAP_SUCCESS); + return LDAP_SUCCESS; } #endif /* HAVE_LDAP_SASL_INTERACTIVE_BIND_S */ @@ -1770,7 +1770,7 @@ sudo_ldap_set_options(ld) if (rc != LDAP_OPT_SUCCESS) { warningx("ldap_set_option: %s -> %d: %s", cur->conf_str, ival, ldap_err2string(rc)); - return(-1); + return -1; } DPRINTF(("ldap_set_option: %s -> %d", cur->conf_str, ival), 1); } @@ -1782,7 +1782,7 @@ sudo_ldap_set_options(ld) if (rc != LDAP_OPT_SUCCESS) { warningx("ldap_set_option: %s -> %s: %s", cur->conf_str, sval, ldap_err2string(rc)); - return(-1); + return -1; } DPRINTF(("ldap_set_option: %s -> %s", cur->conf_str, sval), 1); } @@ -1800,7 +1800,7 @@ sudo_ldap_set_options(ld) if (rc != LDAP_OPT_SUCCESS) { warningx("ldap_set_option(TIMEOUT, %ld): %s", (long)tv.tv_sec, ldap_err2string(rc)); - return(-1); + return -1; } DPRINTF(("ldap_set_option(LDAP_OPT_TIMEOUT, %ld)", (long)tv.tv_sec), 1); @@ -1816,7 +1816,7 @@ sudo_ldap_set_options(ld) if (rc != LDAP_OPT_SUCCESS) { warningx("ldap_set_option(NETWORK_TIMEOUT, %ld): %s", (long)tv.tv_sec, ldap_err2string(rc)); - return(-1); + return -1; } DPRINTF(("ldap_set_option(LDAP_OPT_NETWORK_TIMEOUT, %ld)", (long)tv.tv_sec), 1); @@ -1830,12 +1830,12 @@ sudo_ldap_set_options(ld) if (rc != LDAP_SUCCESS) { warningx("ldap_set_option(LDAP_OPT_X_TLS, LDAP_OPT_X_TLS_HARD): %s", ldap_err2string(rc)); - return(-1); + return -1; } DPRINTF(("ldap_set_option(LDAP_OPT_X_TLS, LDAP_OPT_X_TLS_HARD)"), 1); } #endif - return(0); + return 0; } /* @@ -1853,7 +1853,7 @@ sudo_ldap_result_alloc() result->allocated_entries = 0; result->user_matches = FALSE; result->host_matches = FALSE; - return(result); + return result; } /* @@ -1905,7 +1905,7 @@ sudo_ldap_result_add_search(lres, ldap, searchresult) } else { lres->searches = news; } - return(news); + return news; } /* @@ -1955,7 +1955,7 @@ sudo_ldap_bind_s(ld) } if (rc != LDAP_SUCCESS) { warningx("ldap_sasl_interactive_bind_s(): %s", ldap_err2string(rc)); - return(-1); + return -1; } DPRINTF(("ldap_sasl_interactive_bind_s() ok"), 1); } else @@ -1971,7 +1971,7 @@ sudo_ldap_bind_s(ld) NULL, NULL, NULL); if (rc != LDAP_SUCCESS) { warningx("ldap_sasl_bind_s(): %s", ldap_err2string(rc)); - return(-1); + return -1; } DPRINTF(("ldap_sasl_bind_s() ok"), 1); } @@ -1980,12 +1980,12 @@ sudo_ldap_bind_s(ld) rc = ldap_simple_bind_s(ld, ldap_conf.binddn, ldap_conf.bindpw); if (rc != LDAP_SUCCESS) { warningx("ldap_simple_bind_s(): %s", ldap_err2string(rc)); - return(-1); + return -1; } DPRINTF(("ldap_simple_bind_s() ok"), 1); } #endif - return(0); + return 0; } /* @@ -2001,7 +2001,7 @@ sudo_ldap_open(nss) struct sudo_ldap_handle *handle; if (!sudo_ldap_read_config()) - return(-1); + return -1; /* Prevent reading of user ldaprc and system defaults. */ if (getenv("LDAPNOINIT") == NULL) { @@ -2021,7 +2021,7 @@ sudo_ldap_open(nss) rc = sudo_ldap_init(&ld, ldap_conf.host, ldap_conf.port); if (rc != LDAP_SUCCESS) { warningx("unable to initialize LDAP: %s", ldap_err2string(rc)); - return(-1); + return -1; } if (ldapnoinit) @@ -2029,25 +2029,25 @@ sudo_ldap_open(nss) /* Set LDAP options */ if (sudo_ldap_set_options(ld) < 0) - return(-1); + return -1; if (ldap_conf.ssl_mode == SUDO_LDAP_STARTTLS) { #if defined(HAVE_LDAP_START_TLS_S) rc = ldap_start_tls_s(ld, NULL, NULL); if (rc != LDAP_SUCCESS) { warningx("ldap_start_tls_s(): %s", ldap_err2string(rc)); - return(-1); + return -1; } DPRINTF(("ldap_start_tls_s() ok"), 1); #elif defined(HAVE_LDAP_SSL_CLIENT_INIT) && defined(HAVE_LDAP_START_TLS_S_NP) if (ldap_ssl_client_init(NULL, NULL, 0, &rc) != LDAP_SUCCESS) { warningx("ldap_ssl_client_init(): %s", ldap_err2string(rc)); - return(-1); + return -1; } rc = ldap_start_tls_s_np(ld, NULL); if (rc != LDAP_SUCCESS) { warningx("ldap_start_tls_s_np(): %s", ldap_err2string(rc)); - return(-1); + return -1; } DPRINTF(("ldap_start_tls_s_np() ok"), 1); #else @@ -2057,7 +2057,7 @@ sudo_ldap_open(nss) /* Actually connect */ if (sudo_ldap_bind_s(ld) != 0) - return(-1); + return -1; /* Create a handle container. */ handle = emalloc(sizeof(struct sudo_ldap_handle)); @@ -2067,7 +2067,7 @@ sudo_ldap_open(nss) handle->groups = NULL; nss->handle = handle; - return(0); + return 0; } static int @@ -2082,7 +2082,7 @@ sudo_ldap_setdefs(nss) int rc; if (handle == NULL || handle->ld == NULL) - return(-1); + return -1; ld = handle->ld; for (base = ldap_conf.base; base != NULL; base = base->next) { @@ -2104,7 +2104,7 @@ sudo_ldap_setdefs(nss) ldap_msgfree(result); } - return(0); + return 0; } /* @@ -2123,7 +2123,7 @@ sudo_ldap_lookup(nss, ret, pwflag) struct ldap_result *lres = NULL; if (handle == NULL || handle->ld == NULL) - return(ret); + return ret; ld = handle->ld; /* Fetch list of sudoRole entries that match user and host. */ @@ -2228,7 +2228,7 @@ done: CLR(ret, FLAG_NO_HOST); DPRINTF(("sudo_ldap_lookup(%d)=0x%02x", pwflag, ret), 1); - return(ret); + return ret; } /* @@ -2242,8 +2242,8 @@ ldap_entry_compare(a, b) const struct ldap_entry_wrapper *aw = a; const struct ldap_entry_wrapper *bw = b; - return(bw->order < aw->order ? -1 : - (bw->order > aw->order ? 1 : 0)); + return bw->order < aw->order ? -1 : + (bw->order > aw->order ? 1 : 0); } /* @@ -2261,7 +2261,7 @@ sudo_ldap_result_last_search(lres) while (result->next) result = result->next; } - return(result); + return result; } /* @@ -2308,7 +2308,7 @@ sudo_ldap_result_add_entry(lres, entry) lres->entries[lres->nentries - 1].entry = entry; lres->entries[lres->nentries - 1].order = order; - return(&lres->entries[lres->nentries - 1]); + return &lres->entries[lres->nentries - 1]; } /* @@ -2359,7 +2359,7 @@ sudo_ldap_result_get(nss, pw) strcmp(pw->pw_name, handle->username) == 0) { DPRINTF(("reusing previous result (user %s) with %d entries", handle->username, handle->result->nentries), 1); - return(handle->result); + return handle->result; } /* User mismatch, cached result cannot be used. */ DPRINTF(("removing result (user %s), new search (user %s)", @@ -2431,7 +2431,7 @@ sudo_ldap_result_get(nss, pw) handle->username = estrdup(pw->pw_name); handle->groups = user_groups; - return(lres); + return lres; } /* @@ -2457,7 +2457,7 @@ sudo_ldap_close(nss) efree(nss->handle); nss->handle = NULL; } - return(0); + return 0; } /* @@ -2467,7 +2467,7 @@ static int sudo_ldap_parse(nss) struct sudo_nss *nss; { - return(0); + return 0; } #if 0 @@ -2507,6 +2507,6 @@ sudo_ldap_result_from_search(ldap, searchresult) } DPRINTF(("sudo_ldap_result_from_search: %d entries found", result->nentries), 2); - return(result); + return result; } #endif diff --git a/list.c b/list.c index 1d8c2012b..2fb4967a2 100644 --- a/list.c +++ b/list.c @@ -62,7 +62,7 @@ tq_pop(vh) h->last->next = NULL; } } - return (last); + return last; } /* diff --git a/logging.c b/logging.c index 133939175..610f04571 100644 --- a/logging.c +++ b/logging.c @@ -613,10 +613,10 @@ should_mail(status) int status; { - return(def_mail_always || ISSET(status, VALIDATE_ERROR) || + return def_mail_always || ISSET(status, VALIDATE_ERROR) || (def_mail_no_user && ISSET(status, FLAG_NO_USER)) || (def_mail_no_host && ISSET(status, FLAG_NO_HOST)) || - (def_mail_no_perms && !ISSET(status, VALIDATE_OK))); + (def_mail_no_perms && !ISSET(status, VALIDATE_OK)); } #define LL_TTY_STR "TTY=" @@ -732,7 +732,7 @@ new_logline(message, serrno) goto toobig; } - return (line); + return line; toobig: errorx(1, "internal error: insufficient space for log line"); } diff --git a/match.c b/match.c index e8aaadf6c..fd63bfbba 100644 --- a/match.c +++ b/match.c @@ -146,7 +146,7 @@ _userlist_matches(pw, list) if (matched != UNSPEC) break; } - return(matched); + return matched; } int @@ -155,7 +155,7 @@ userlist_matches(pw, list) struct member_list *list; { alias_seqno++; - return(_userlist_matches(pw, list)); + return _userlist_matches(pw, list); } /* @@ -177,7 +177,7 @@ _runaslist_matches(user_list, group_list) if (runas_pw != NULL) { /* If no runas user or runas group listed in sudoers, use default. */ if (tq_empty(user_list) && tq_empty(group_list)) - return(userpw_matches(def_runas_default, runas_pw->pw_name, runas_pw)); + return userpw_matches(def_runas_default, runas_pw->pw_name, runas_pw); tq_foreach_rev(user_list, m) { switch (m->type) { @@ -239,10 +239,10 @@ _runaslist_matches(user_list, group_list) } if (user_matched == DENY || group_matched == DENY) - return(DENY); + return DENY; if (user_matched == group_matched || runas_gr == NULL) - return(user_matched); - return(UNSPEC); + return user_matched; + return UNSPEC; } int @@ -251,8 +251,8 @@ runaslist_matches(user_list, group_list) struct member_list *group_list; { alias_seqno++; - return(_runaslist_matches(user_list ? user_list : &empty, - group_list ? group_list : &empty)); + return _runaslist_matches(user_list ? user_list : &empty, + group_list ? group_list : &empty); } /* @@ -296,7 +296,7 @@ _hostlist_matches(list) if (matched != UNSPEC) break; } - return(matched); + return matched; } int @@ -304,7 +304,7 @@ hostlist_matches(list) struct member_list *list; { alias_seqno++; - return(_hostlist_matches(list)); + return _hostlist_matches(list); } /* @@ -323,7 +323,7 @@ _cmndlist_matches(list) if (matched != UNSPEC) break; } - return(matched); + return matched; } int @@ -331,7 +331,7 @@ cmndlist_matches(list) struct member_list *list; { alias_seqno++; - return(_cmndlist_matches(list)); + return _cmndlist_matches(list); } /* @@ -364,7 +364,7 @@ cmnd_matches(m) matched = !m->negated; break; } - return(matched); + return matched; } static int @@ -414,13 +414,13 @@ command_matches(sudoers_cmnd, sudoers_args) */ if (strcmp(sudoers_cmnd, "sudoedit") != 0 || strcmp(user_cmnd, "sudoedit") != 0) - return(FALSE); + return FALSE; if (command_args_match(sudoers_cmnd, sudoers_args)) { efree(safe_cmnd); safe_cmnd = estrdup(sudoers_cmnd); - return(TRUE); + return TRUE; } else - return(FALSE); + return FALSE; } if (has_meta(sudoers_cmnd)) { @@ -429,10 +429,10 @@ command_matches(sudoers_cmnd, sudoers_args) * use glob(3) and/or fnmatch(3) to do the matching. */ if (def_fast_glob) - return(command_matches_fnmatch(sudoers_cmnd, sudoers_args)); - return(command_matches_glob(sudoers_cmnd, sudoers_args)); + return command_matches_fnmatch(sudoers_cmnd, sudoers_args); + return command_matches_glob(sudoers_cmnd, sudoers_args); } - return(command_matches_normal(sudoers_cmnd, sudoers_args)); + return command_matches_normal(sudoers_cmnd, sudoers_args); } static int @@ -448,14 +448,14 @@ command_matches_fnmatch(sudoers_cmnd, sudoers_args) * else return false. */ if (fnmatch(sudoers_cmnd, user_cmnd, FNM_PATHNAME) != 0) - return(FALSE); + return FALSE; if (command_args_match(sudoers_cmnd, sudoers_args)) { if (safe_cmnd) free(safe_cmnd); safe_cmnd = estrdup(user_cmnd); - return(TRUE); + return TRUE; } else - return(FALSE); + return FALSE; } static int @@ -478,7 +478,7 @@ command_matches_glob(sudoers_cmnd, sudoers_args) if ((base = strrchr(sudoers_cmnd, '/')) != NULL) { base++; if (!has_meta(base) && strcmp(user_base, base) != 0) - return(FALSE); + return FALSE; } } /* @@ -491,7 +491,7 @@ command_matches_glob(sudoers_cmnd, sudoers_args) #define GLOB_FLAGS (GLOB_NOSORT | GLOB_MARK | GLOB_BRACE | GLOB_TILDE) if (glob(sudoers_cmnd, GLOB_FLAGS, NULL, &gl) != 0 || gl.gl_pathc == 0) { globfree(&gl); - return(FALSE); + return FALSE; } /* For each glob match, compare basename, st_dev and st_ino. */ for (ap = gl.gl_pathv; (cp = *ap) != NULL; ap++) { @@ -499,7 +499,7 @@ command_matches_glob(sudoers_cmnd, sudoers_args) dlen = strlen(cp); if (cp[dlen - 1] == '/') { if (command_matches_dir(cp, dlen)) - return(TRUE); + return TRUE; continue; } @@ -521,14 +521,14 @@ command_matches_glob(sudoers_cmnd, sudoers_args) } globfree(&gl); if (cp == NULL) - return(FALSE); + return FALSE; if (command_args_match(sudoers_cmnd, sudoers_args)) { efree(safe_cmnd); safe_cmnd = estrdup(user_cmnd); - return(TRUE); + return TRUE; } - return(FALSE); + return FALSE; } static int @@ -543,7 +543,7 @@ command_matches_normal(sudoers_cmnd, sudoers_args) /* If it ends in '/' it is a directory spec. */ dlen = strlen(sudoers_cmnd); if (sudoers_cmnd[dlen - 1] == '/') - return(command_matches_dir(sudoers_cmnd, dlen)); + return command_matches_dir(sudoers_cmnd, dlen); /* Only proceed if user_base and basename(sudoers_cmnd) match */ if ((base = strrchr(sudoers_cmnd, '/')) == NULL) @@ -552,7 +552,7 @@ command_matches_normal(sudoers_cmnd, sudoers_args) base++; if (strcmp(user_base, base) != 0 || stat(sudoers_cmnd, &sudoers_stat) == -1) - return(FALSE); + return FALSE; /* * Return true if inode/device matches AND @@ -563,13 +563,13 @@ command_matches_normal(sudoers_cmnd, sudoers_args) if (user_stat != NULL && (user_stat->st_dev != sudoers_stat.st_dev || user_stat->st_ino != sudoers_stat.st_ino)) - return(FALSE); + return FALSE; if (command_args_match(sudoers_cmnd, sudoers_args)) { efree(safe_cmnd); safe_cmnd = estrdup(sudoers_cmnd); - return(TRUE); + return TRUE; } - return(FALSE); + return FALSE; } /* @@ -590,11 +590,11 @@ command_matches_dir(sudoers_dir, dlen) */ dirp = opendir(sudoers_dir); if (dirp == NULL) - return(FALSE); + return FALSE; if (strlcpy(buf, sudoers_dir, sizeof(buf)) >= sizeof(buf)) { closedir(dirp); - return(FALSE); + return FALSE; } while ((dent = readdir(dirp)) != NULL) { /* ignore paths > PATH_MAX (XXX - log) */ @@ -615,7 +615,7 @@ command_matches_dir(sudoers_dir, dlen) } closedir(dirp); - return(dent != NULL); + return dent != NULL; } static int @@ -649,24 +649,24 @@ addr_matches_if(n) if (ifp->addr.ip4.s_addr == addr.ip4.s_addr || (ifp->addr.ip4.s_addr & ifp->netmask.ip4.s_addr) == addr.ip4.s_addr) - return(TRUE); + return TRUE; break; #ifdef HAVE_IN6_ADDR case AF_INET6: if (memcmp(ifp->addr.ip6.s6_addr, addr.ip6.s6_addr, sizeof(addr.ip6.s6_addr)) == 0) - return(TRUE); + return TRUE; for (j = 0; j < sizeof(addr.ip6.s6_addr); j++) { if ((ifp->addr.ip6.s6_addr[j] & ifp->netmask.ip6.s6_addr[j]) != addr.ip6.s6_addr[j]) break; } if (j == sizeof(addr.ip6.s6_addr)) - return(TRUE); + return TRUE; #endif } } - return(FALSE); + return FALSE; } static int @@ -726,7 +726,7 @@ addr_matches_if_netmask(n, m) switch(family) { case AF_INET: if ((ifp->addr.ip4.s_addr & mask.ip4.s_addr) == addr.ip4.s_addr) - return(TRUE); + return TRUE; #ifdef HAVE_IN6_ADDR case AF_INET6: for (j = 0; j < sizeof(addr.ip6.s6_addr); j++) { @@ -734,12 +734,12 @@ addr_matches_if_netmask(n, m) break; } if (j == sizeof(addr.ip6.s6_addr)) - return(TRUE); + return TRUE; #endif /* HAVE_IN6_ADDR */ } } - return(FALSE); + return FALSE; } /* @@ -761,7 +761,7 @@ addr_matches(n) } else retval = addr_matches_if(n); - return(retval); + return retval; } /* @@ -775,14 +775,14 @@ hostname_matches(shost, lhost, pattern) { if (has_meta(pattern)) { if (strchr(pattern, '.')) - return(!fnmatch(pattern, lhost, FNM_CASEFOLD)); + return !fnmatch(pattern, lhost, FNM_CASEFOLD); else - return(!fnmatch(pattern, shost, FNM_CASEFOLD)); + return !fnmatch(pattern, shost, FNM_CASEFOLD); } else { if (strchr(pattern, '.')) - return(!strcasecmp(lhost, pattern)); + return !strcasecmp(lhost, pattern); else - return(!strcasecmp(shost, pattern)); + return !strcasecmp(shost, pattern); } } @@ -799,9 +799,9 @@ userpw_matches(sudoers_user, user, pw) if (pw != NULL && *sudoers_user == '#') { uid_t uid = (uid_t) atoi(sudoers_user + 1); if (uid == pw->pw_uid) - return(TRUE); + return TRUE; } - return(strcmp(sudoers_user, user) == 0); + return strcmp(sudoers_user, user) == 0; } /* @@ -816,9 +816,9 @@ group_matches(sudoers_group, gr) if (*sudoers_group == '#') { gid_t gid = (gid_t) atoi(sudoers_group + 1); if (gid == gr->gr_gid) - return(TRUE); + return TRUE; } - return(strcmp(gr->gr_name, sudoers_group) == 0); + return strcmp(gr->gr_name, sudoers_group) == 0; } /* @@ -870,7 +870,7 @@ done: if (pw0 != NULL) pw_delref(pw0); - return(matched); + return matched; } /* @@ -894,7 +894,7 @@ netgr_matches(netgr, lhost, shost, user) /* make sure we have a valid netgroup, sudo style */ if (*netgr++ != '+') - return(FALSE); + return FALSE; #ifdef HAVE_GETDOMAINNAME /* get the domain name (if any) */ @@ -910,10 +910,10 @@ netgr_matches(netgr, lhost, shost, user) #ifdef HAVE_INNETGR if (innetgr(netgr, lhost, user, domain)) - return(TRUE); + return TRUE; else if (lhost != shost && innetgr(netgr, shost, user, domain)) - return(TRUE); + return TRUE; #endif /* HAVE_INNETGR */ - return(FALSE); + return FALSE; } diff --git a/memrchr.c b/memrchr.c index 80a25f64f..2d75db8f3 100644 --- a/memrchr.c +++ b/memrchr.c @@ -34,8 +34,8 @@ memrchr(s, c, n) cp = (unsigned char *)s + n; do { if (*(--cp) == (unsigned char)c) - return((void *)cp); + return (void *)cp; } while (--n != 0); } - return((void *)0); + return (void *)0; } diff --git a/mkstemps.c b/mkstemps.c index 7245f1972..d72de98a9 100644 --- a/mkstemps.c +++ b/mkstemps.c @@ -62,7 +62,7 @@ mkstemps(path, slen) ; if (path + slen >= ep) { errno = EINVAL; - return(-1); + return -1; } ep -= slen; @@ -81,11 +81,11 @@ mkstemps(path, slen) fd = open(path, O_CREAT|O_EXCL|O_RDWR, S_IRUSR|S_IWUSR); if (fd != -1 || errno != EEXIST) - return(fd); + return fd; } while (--tries); errno = EEXIST; - return(-1); + return -1; } #ifdef HAVE_RANDOM @@ -129,5 +129,5 @@ get_random() initialized = 1; } - return(RAND() & 0xffffffff); + return RAND() & 0xffffffff; } diff --git a/mon_systrace.c b/mon_systrace.c index 2e88ba1b8..198b34008 100644 --- a/mon_systrace.c +++ b/mon_systrace.c @@ -54,7 +54,7 @@ systrace_open() fd = open(_PATH_DEV_SYSTRACE, O_RDONLY, 0644); if (fd == -1) - return(-1); + return -1; serrno = errno; #ifdef SYSTR_CLONE @@ -69,11 +69,11 @@ systrace_open() if (fcntl(fd, F_SETFD, 1) == -1) /* really needed? */ goto bad; - return(fd); + return fd; bad: close(fd); errno = serrno; - return(-1); + return -1; } static void @@ -334,13 +334,13 @@ switch_emulation(fd, msgp) struct emulation *emul; if ((entry = find_child(msgp->msg_pid)) == NULL) - return(-1); + return -1; for (emul = emulations; emul != NULL; emul++) if (strcmp(emul->name, msgp->msg_data.msg_emul.emul) == 0) { entry->action = emul->action; - return(set_policy(fd, entry)); + return set_policy(fd, entry); } - return(-1); + return -1; } /* @@ -376,9 +376,9 @@ find_child(pid) for (cur = children.first; cur != NULL; cur = cur->next) { if (cur->pid == pid) - return(cur); + return cur; } - return(NULL); + return NULL; } /* @@ -417,12 +417,12 @@ set_policy(fd, child) pol.strp_num = -1; pol.strp_maxents = SYSTRACE_MAXENTS; if (ioctl(fd, STRIOCPOLICY, &pol) == -1) - return(-1); + return -1; pol.strp_op = SYSTR_POLICY_ASSIGN; pol.strp_pid = child->pid; if (ioctl(fd, STRIOCPOLICY, &pol) == -1) - return(-1); + return -1; for (i = 0; i < SYSTRACE_MAXENTS; i++) { pol.strp_op = SYSTR_POLICY_MODIFY; @@ -435,9 +435,9 @@ set_policy(fd, child) } } if (ioctl(fd, STRIOCPOLICY, &pol) == -1) - return(-1); + return -1; } - return(0); + return 0; } /* @@ -463,7 +463,7 @@ systrace_read(fd, pid, addr, buf, bufsiz) io.strio_op = SYSTR_READ; if ((rval = ioctl(fd, STRIOCIO, &io)) != 0) warning("systrace_read: STRIOCIO"); - return(rval ? -1 : (ssize_t)io.strio_len); + return rval ? -1 : (ssize_t)io.strio_len; } /* @@ -495,7 +495,7 @@ read_string(fd, pid, addr, buf, bufsiz) bufsiz -= nread; } else { if (errno != EINVAL || chunksiz == 1) - return(-1); + return -1; chunksiz >>= 1; /* chunksiz too big, halve it */ } } @@ -503,7 +503,7 @@ read_string(fd, pid, addr, buf, bufsiz) if (cp == buf) warningx("read empty string, chunksize == %d", chunksiz); /* XXX, should not happen but does */ #endif - return(bufsiz >= chunksiz ? cp - buf : -1); + return bufsiz >= chunksiz ? cp - buf : -1; } static struct syscallhandler * @@ -516,13 +516,13 @@ find_handler(pid, code) if ((child = find_child(pid)) == NULL) { warningx("unable to find child with pid %d", pid); - return(NULL); + return NULL; } for (sca = child->action; sca->code != -1; sca++) { if (sca->code == code) - return(&sca->handler); + return &sca->handler; } - return(NULL); + return NULL; } #define SUDO_USER 0 @@ -554,7 +554,7 @@ systrace_write(fd, pid, addr, buf, len) io.strio_op = SYSTR_WRITE; if ((rval = ioctl(fd, STRIOCIO, &io)) != 0) warning("systrace_write: STRIOCIO"); - return(rval ? -1 : (ssize_t)io.strio_len); + return rval ? -1 : (ssize_t)io.strio_len; } /* @@ -583,12 +583,12 @@ update_env(fd, pid, seqnr, askp) envep = envbuf + (sizeof(envbuf) / sizeof(char *)); for (envp = envbuf; envp < envep; envp++, off += sizeof(char *)) { if (systrace_read(fd, pid, off, &ap, sizeof(ap)) == -1) - return(-1); + return -1; if ((*envp = ap) == NULL) break; memset(buf, 0, sizeof(buf)); if ((len = read_string(fd, pid, ap, buf, sizeof(buf))) == -1) - return(-1); + return -1; if (buf[0] == 'S') { if (strncmp(buf, "SUDO_USER=", 10) == 0) { offsets[SUDO_USER] = off; @@ -662,7 +662,7 @@ update_env(fd, pid, seqnr, askp) if (replace[SUDO_USER]) { n = snprintf(cp, sizeof(buf) - (cp - buf), "SUDO_USER=%s", user_name); if (n < 0 || n >= sizeof(buf) - (cp - buf)) - return(-1); + return -1; replace[SUDO_USER] = cp; cp += n + 1; } @@ -670,7 +670,7 @@ update_env(fd, pid, seqnr, askp) n = snprintf(cp, sizeof(buf) - (cp - buf), "SUDO_COMMAND=%s%s%s", user_cmnd, user_args ? " " : "", user_args ? user_args : ""); if (n < 0 || n >= sizeof(buf) - (cp - buf)) - return(-1); + return -1; replace[SUDO_COMMAND] = cp; cp += n + 1; } @@ -678,7 +678,7 @@ update_env(fd, pid, seqnr, askp) n = snprintf(cp, sizeof(buf) - (cp - buf), "SUDO_UID=%lu", (unsigned long) user_uid); if (n < 0 || n >= sizeof(buf) - (cp - buf)) - return(-1); + return -1; replace[SUDO_UID] = cp; cp += n + 1; } @@ -686,7 +686,7 @@ update_env(fd, pid, seqnr, askp) n = snprintf(cp, sizeof(buf) - (cp - buf), "SUDO_GID=%lu", (unsigned long) user_gid); if (n < 0 || n >= sizeof(buf) - (cp - buf)) - return(-1); + return -1; replace[SUDO_GID] = cp; cp += n + 1; } @@ -697,7 +697,7 @@ update_env(fd, pid, seqnr, askp) inject.stri_addr = buf; inject.stri_len = cp - buf; if (ioctl(fd, STRIOCINJECT, &inject) != 0) - return(-1); + return -1; n = (offsets[SUDO_USER] == NULL) + (offsets[SUDO_COMMAND] == NULL) + (offsets[SUDO_UID] == NULL) + (offsets[SUDO_GID] == NULL); /* @@ -713,7 +713,7 @@ update_env(fd, pid, seqnr, askp) continue; ap = inject.stri_addr + (replace[n] - buf); if (systrace_write(fd, pid, offsets[n], &ap, sizeof(ap)) == -1) - return(-1); + return -1; } } else { /* @@ -731,7 +731,7 @@ update_env(fd, pid, seqnr, askp) *envp = inject.stri_addr + (replace[SUDO_GID] - buf); } if (envp + n >= envep) - return(-1); + return -1; if (offsets[SUDO_USER] == NULL) *envp++ = inject.stri_addr + (replace[SUDO_USER] - buf); if (offsets[SUDO_COMMAND] == NULL) @@ -753,10 +753,10 @@ update_env(fd, pid, seqnr, askp) repl.strr_off[0] = 0; repl.strr_offlen[0] = (char *)envp - (char *)envbuf; if (ioctl(fd, STRIOCREPLACE, &repl) != 0) - return(-1); + return -1; } } - return(0); + return 0; } #endif /* STRIOCINJECT */ @@ -782,7 +782,7 @@ decode_args(fd, pid, askp) */ memset(pbuf, 0, sizeof(pbuf)); if (read_string(fd, pid, (void *)askp->args[0], pbuf, sizeof(pbuf)) == -1) - return(-1); + return -1; if ((user_base = strrchr(user_cmnd = pbuf, '/')) != NULL) user_base++; else @@ -802,7 +802,7 @@ decode_args(fd, pid, askp) off = (char *)askp->args[1]; for (cp = abuf, ep = abuf + sizeof(abuf); cp < ep; off += sizeof(char *)) { if (systrace_read(fd, pid, off, &ap, sizeof(ap)) == -1) - return(-1); + return -1; if (ap == NULL) break; /* end of args */ if (argc + 1 >= argc_max) { @@ -810,7 +810,7 @@ decode_args(fd, pid, askp) argv = erealloc3(argv, argc_max, sizeof(char *)); } if ((len = read_string(fd, pid, ap, cp, ep - cp)) == -1) - return(-1); + return -1; argv[argc++] = cp; cp += len; } @@ -832,7 +832,7 @@ decode_args(fd, pid, askp) } efree(argv); - return(0); + return 0; } static void @@ -865,30 +865,30 @@ check_execv(fd, pid, seqnr, askp, policyp, errorp) if (initialized == 0) { initialized = 1; *policyp = SYSTR_POLICY_PERMIT; - return(0); + return 0; } /* Failure should not be possible. */ if ((info = find_child(pid)) == NULL) { *policyp = SYSTR_POLICY_NEVER; *errorp = ECHILD; - return(0); + return 0; } /* Fill in user_cmnd, user_base, user_args and user_stat. */ if (decode_args(fd, pid, askp) != 0) { if (errno == EBUSY) - return(-1); + return -1; *policyp = SYSTR_POLICY_NEVER; *errorp = errno; - return(0); + return 0; } /* Get process cwd. */ rval = ioctl(fd, STRIOCGETCWD, &pid); if (rval == -1 || getcwd(user_cwd, sizeof(user_cwd)) == NULL) { if (rval == -1 && errno == EBUSY) - return(-1); + return -1; warningx("cannot get working directory"); (void) strlcpy(user_cwd, "unknown", sizeof(user_cwd)); } @@ -901,7 +901,7 @@ check_execv(fd, pid, seqnr, askp, policyp, errorp) warning("can't restore cwd"); *policyp = SYSTR_POLICY_NEVER; *errorp = EACCES; - return(0); + return 0; } if (rval != -1 && ioctl(fd, STRIOCRESCWD, 0) != 0) warning("can't restore cwd"); @@ -929,7 +929,7 @@ check_execv(fd, pid, seqnr, askp, policyp, errorp) *policyp = SYSTR_POLICY_NEVER; *errorp = EACCES; } - return(validated); + return validated; } /* @@ -955,7 +955,7 @@ check_execve(fd, pid, seqnr, askp, policyp, errorp) rval = -1; } #endif - return(rval); + return rval; } /* diff --git a/nanosleep.c b/nanosleep.c index b7fb50729..921b34d19 100644 --- a/nanosleep.c +++ b/nanosleep.c @@ -52,5 +52,5 @@ nanosleep(ts, rts) rts->tv_sec = endtime.tv_sec; rts->tv_nsec = endtime.tv_usec * 1000; } - return(rval); + return rval; } diff --git a/parse.c b/parse.c index 97aba79cc..a6174c654 100644 --- a/parse.c +++ b/parse.c @@ -83,9 +83,9 @@ sudo_file_open(nss) struct sudo_nss *nss; { if (def_ignore_local_sudoers) - return(-1); + return -1; nss->handle = open_sudoers(_PATH_SUDOERS, FALSE, NULL); - return(nss->handle ? 0 : -1); + return nss->handle ? 0 : -1; } int @@ -99,7 +99,7 @@ sudo_file_close(nss) nss->handle = NULL; yyin = NULL; } - return(0); + return 0; } /* @@ -110,16 +110,16 @@ sudo_file_parse(nss) struct sudo_nss *nss; { if (nss->handle == NULL) - return(-1); + return -1; init_parser(_PATH_SUDOERS, 0); yyin = nss->handle; if (yyparse() != 0 || parse_error) { log_error(NO_EXIT, "parse error in %s near line %d", errorfile, errorlineno); - return(-1); + return -1; } - return(0); + return 0; } /* @@ -130,11 +130,11 @@ sudo_file_setdefs(nss) struct sudo_nss *nss; { if (nss->handle == NULL) - return(-1); + return -1; if (!update_defaults(SETDEF_GENERIC|SETDEF_HOST|SETDEF_USER)) - return(-1); - return(0); + return -1; + return 0; } /* @@ -154,7 +154,7 @@ sudo_file_lookup(nss, validated, pwflag) struct userspec *us; if (nss->handle == NULL) - return(validated); + return validated; /* * Only check the actual command if pwflag is not set. @@ -200,7 +200,7 @@ sudo_file_lookup(nss, validated, pwflag) SET(validated, FLAG_CHECK_USER); else if (pwcheck == never || nopass == TRUE) def_authenticate = FALSE; - return(validated); + return validated; } /* Need to be runas user while stat'ing things. */ @@ -259,7 +259,7 @@ sudo_file_lookup(nss, validated, pwflag) CLR(validated, VALIDATE_OK); } set_perms(PERM_ROOT); - return(validated); + return validated; } #define TAG_CHANGED(t) \ @@ -361,7 +361,7 @@ sudo_file_display_priv_short(pw, us, lbuf) } lbuf_append(lbuf, "\n", NULL); } - return(nfound); + return nfound; } static int @@ -416,7 +416,7 @@ sudo_file_display_priv_long(pw, us, lbuf) nfound++; } } - return(nfound); + return nfound; } int @@ -441,7 +441,7 @@ sudo_file_display_privs(nss, pw, lbuf) nfound += sudo_file_display_priv_short(pw, us, lbuf); } done: - return(nfound); + return nfound; } /* @@ -495,7 +495,7 @@ sudo_file_display_defaults(nss, pw, lbuf) nfound++; } done: - return(nfound); + return nfound; } /* @@ -513,7 +513,7 @@ sudo_file_display_bound_defaults(nss, pw, lbuf) nfound += display_bound_defaults(DEFAULTS_RUNAS, lbuf); nfound += display_bound_defaults(DEFAULTS_CMND, lbuf); - return(nfound); + return nfound; } /* @@ -551,7 +551,7 @@ display_bound_defaults(dtype, lbuf) dsep = "!"; break; default: - return(-1); + return -1; } /* printf("Per-%s Defaults entries:\n", dname); */ tq_foreach_fwd(&defaults, d) { @@ -579,7 +579,7 @@ display_bound_defaults(dtype, lbuf) lbuf_append(lbuf, d->op == FALSE ? "!" : "", d->var, NULL); } - return(nfound); + return nfound; } int @@ -627,7 +627,7 @@ sudo_file_display_cmnd(nss, pw) rval = 0; } done: - return(rval); + return rval; } /* diff --git a/parse_args.c b/parse_args.c index 3611b443d..d03ff270c 100644 --- a/parse_args.c +++ b/parse_args.c @@ -303,7 +303,7 @@ parse_args(argc, argv) if (NewArgc == 0 && mode == MODE_RUN && !ISSET(flags, MODE_SHELL)) SET(flags, (MODE_IMPLIED_SHELL | MODE_SHELL)); - return(mode | flags); + return mode | flags; } static int diff --git a/pwutil.c b/pwutil.c index b8e5dc8b2..8cb3998a7 100644 --- a/pwutil.c +++ b/pwutil.c @@ -93,7 +93,7 @@ cmp_pwuid(v1, v2) { const struct cache_item *ci1 = (const struct cache_item *) v1; const struct cache_item *ci2 = (const struct cache_item *) v2; - return(ci1->k.uid - ci2->k.uid); + return ci1->k.uid - ci2->k.uid; } /* @@ -106,7 +106,7 @@ cmp_pwnam(v1, v2) { const struct cache_item *ci1 = (const struct cache_item *) v1; const struct cache_item *ci2 = (const struct cache_item *) v2; - return(strcmp(ci1->k.name, ci2->k.name)); + return strcmp(ci1->k.name, ci2->k.name); } #define FIELD_SIZE(src, name, size) \ @@ -167,7 +167,7 @@ make_pwitem(pw, name) /* Allocate space for struct item, struct passwd and the strings. */ if ((item = malloc(total)) == NULL) - return(NULL); + return NULL; cp = (char *) item + sizeof(struct cache_item); /* @@ -199,7 +199,7 @@ make_pwitem(pw, name) item->d.pw = newpw; item->refcnt = 1; - return(item); + return item; } void @@ -267,7 +267,7 @@ sudo_getpwuid(uid) #endif done: item->refcnt++; - return(item->d.pw); + return item->d.pw; } /* @@ -312,7 +312,7 @@ sudo_getpwnam(name) #endif done: item->refcnt++; - return(item->d.pw); + return item->d.pw; } /* @@ -370,7 +370,7 @@ sudo_fakepwnam(user, gid) } } item->refcnt++; - return(pw); + return pw; } void @@ -413,7 +413,7 @@ cmp_grgid(v1, v2) { const struct cache_item *ci1 = (const struct cache_item *) v1; const struct cache_item *ci2 = (const struct cache_item *) v2; - return(ci1->k.gid - ci2->k.gid); + return ci1->k.gid - ci2->k.gid; } /* @@ -446,7 +446,7 @@ make_gritem(gr, name) total += strlen(name) + 1; if ((item = malloc(total)) == NULL) - return(NULL); + return NULL; cp = (char *) item + sizeof(struct cache_item); /* @@ -481,7 +481,7 @@ make_gritem(gr, name) item->d.gr = newgr; item->refcnt = 1; - return(item); + return item; } void @@ -542,7 +542,7 @@ sudo_getgrgid(gid) } done: item->refcnt++; - return(item->d.gr); + return item->d.gr; } /* @@ -580,7 +580,7 @@ sudo_getgrnam(name) } done: item->refcnt++; - return(item->d.gr); + return item->d.gr; } /* @@ -626,7 +626,7 @@ sudo_fakegrnam(group) } } item->refcnt++; - return(gr); + return gr; } void @@ -737,5 +737,5 @@ user_in_group(pw, group) done: if (grp != NULL) gr_delref(grp); - return(retval); + return retval; } diff --git a/redblack.c b/redblack.c index 95ac095b0..fb3611b2d 100644 --- a/redblack.c +++ b/redblack.c @@ -110,7 +110,7 @@ rbcreate(compar) tree->root.color = black; tree->root.data = NULL; - return(tree); + return tree; } /* @@ -181,7 +181,7 @@ rbinsert(tree, data) while (node != rbnil(tree)) { parent = node; if ((res = tree->compar(data, node->data)) == 0) - return(node); + return node; node = res < 0 ? node->left : node->right; } @@ -255,7 +255,7 @@ rbinsert(tree, data) } } rbfirst(tree)->color = black; /* first node is always black */ - return(NULL); + return NULL; } /* @@ -272,10 +272,10 @@ rbfind(tree, key) while (node != rbnil(tree)) { if ((res = tree->compar(key, node->data)) == 0) - return(node); + return node; node = res < 0 ? node->left : node->right; } - return(NULL); + return NULL; } /* @@ -296,19 +296,19 @@ rbapply_node(tree, node, func, cookie, order) if (node != rbnil(tree)) { if (order == preorder) if ((error = func(node->data, cookie)) != 0) - return(error); + return error; if ((error = rbapply_node(tree, node->left, func, cookie, order)) != 0) - return(error); + return error; if (order == inorder) if ((error = func(node->data, cookie)) != 0) - return(error); + return error; if ((error = rbapply_node(tree, node->right, func, cookie, order)) != 0) - return(error); + return error; if (order == postorder) if ((error = func(node->data, cookie)) != 0) - return(error); + return error; } - return (0); + return 0; } /* @@ -331,7 +331,7 @@ rbsuccessor(tree, node) if (succ == rbroot(tree)) succ = rbnil(tree); } - return(succ); + return succ; } /* @@ -404,7 +404,7 @@ void *rbdelete(tree, z) } free(z); - return (data); + return data; } /* diff --git a/set_perms.c b/set_perms.c index d028b2c39..355baad55 100644 --- a/set_perms.c +++ b/set_perms.c @@ -87,7 +87,7 @@ set_perms(perm) CLR(perm, PERM_MASK); if (perm == current_perm) - return(1); + return 1; switch (perm) { case PERM_ROOT: @@ -172,12 +172,12 @@ set_perms(perm) } current_perm = perm; - return(1); + return 1; bad: warningx("%s: %s", errstr, errno == EAGAIN ? "too many processes" : strerror(errno)); if (noexit) - return(0); + return 0; exit(1); } @@ -201,7 +201,7 @@ set_perms(perm) CLR(perm, PERM_MASK); if (perm == current_perm) - return(1); + return 1; switch (perm) { case PERM_ROOT: @@ -289,12 +289,12 @@ set_perms(perm) } current_perm = perm; - return(1); + return 1; bad: warningx("%s: %s", errstr, errno == EAGAIN ? "too many processes" : strerror(errno)); if (noexit) - return(0); + return 0; exit(1); } @@ -316,7 +316,7 @@ set_perms(perm) CLR(perm, PERM_MASK); if (perm == current_perm) - return(1); + return 1; /* * Since we only have setuid() and seteuid() and semantics @@ -408,12 +408,12 @@ set_perms(perm) } current_perm = perm; - return(1); + return 1; bad: warningx("%s: %s", errstr, errno == EAGAIN ? "too many processes" : strerror(errno)); if (noexit) - return(0); + return 0; exit(1); } @@ -435,7 +435,7 @@ set_perms(perm) CLR(perm, PERM_MASK); if (perm == current_perm) - return(1); + return 1; switch (perm) { case PERM_ROOT: @@ -472,12 +472,12 @@ set_perms(perm) } current_perm = perm; - return(1); + return 1; bad: warningx("%s: %s", errstr, errno == EAGAIN ? "too many processes" : strerror(errno)); if (noexit) - return(0); + return 0; exit(1); } # endif /* HAVE_SETEUID */ diff --git a/sigaction.c b/sigaction.c index 670e87ecc..1969495b5 100644 --- a/sigaction.c +++ b/sigaction.c @@ -44,7 +44,7 @@ sigaction(signo, sa, osa) if (!error && osa) osa->sa_flags ^= SV_INTERRUPT; /* flip SV_INTERRUPT as above */ - return(error); + return error; } int @@ -53,7 +53,7 @@ sigemptyset(set) { *set = 0; - return(0); + return 0; } int @@ -62,7 +62,7 @@ sigfillset(set) { *set = ~0;; - return(0); + return 0; } int @@ -73,11 +73,11 @@ sigaddset(set, signo) if (signo <= 0 || signo >= NSIG) { errno = EINVAL; - return(-1); + return -1; } SET(*set, sigmask(signo)); - return(0); + return 0; } int @@ -88,11 +88,11 @@ sigdelset(set, signo) if (signo <= 0 || signo >= NSIG) { errno = EINVAL; - return(-1); + return -1; } CLR(*set, sigmask(signo)); - return(0); + return 0; } int @@ -101,7 +101,7 @@ sigismember(set, signo) int signo; { - return(ISSET(*set, sigmask(signo))); + return ISSET(*set, sigmask(signo)); } int @@ -127,12 +127,12 @@ sigprocmask(how, set, oset) mask = sigsetmask(*set); break; default: - return(-1); + return -1; } if (mask == -1) - return(-1); + return -1; if (oset) *oset = mask; - return(0); + return 0; } diff --git a/snprintf.c b/snprintf.c index 2ccbd14ff..a1a3322fc 100644 --- a/snprintf.c +++ b/snprintf.c @@ -139,10 +139,10 @@ memchr(s, c, n) do { if (*p++ == c) - return ((void *)(p - 1)); + return (void *)(p - 1); } while (--n != 0); } - return (NULL); + return NULL; } #endif /* !HAVE_MEMCHR */ @@ -170,7 +170,7 @@ __ultoa(val, endp, base, octzero, xdigs) case 10: if (val < 10) { /* many numbers are 1 digit */ *--cp = to_char(val); - return (cp); + return cp; } /* * On many machines, unsigned arithmetic is harder than @@ -208,7 +208,7 @@ __ultoa(val, endp, base, octzero, xdigs) default: /* oops */ abort(); } - return (cp); + return cp; } /* Identical to __ultoa, but for quads. */ @@ -229,12 +229,12 @@ __uqtoa(val, endp, base, octzero, xdigs) /* quick test for small values; __ultoa is typically much faster */ /* (perhaps instead we should run until small, then call __ultoa?) */ if (val <= (unsigned long long)ULONG_MAX) - return (__ultoa((unsigned long)val, endp, base, octzero, xdigs)); + return __ultoa((unsigned long)val, endp, base, octzero, xdigs); switch (base) { case 10: if (val < 10) { *--cp = to_char(val % 10); - return (cp); + return cp; } if (val > LLONG_MAX) { *--cp = to_char(val % 10); @@ -266,7 +266,7 @@ __uqtoa(val, endp, base, octzero, xdigs) default: /* oops */ abort(); } - return (cp); + return cp; } # endif /* !SIZEOF_LONG_INT */ #endif /* HAVE_LONG_LONG_INT */ @@ -693,7 +693,7 @@ number: if ((dprec = prec) >= 0) done: if (strsize) *str = '\0'; - return (ret); + return ret; /* NOTREACHED */ } @@ -706,7 +706,7 @@ vsnprintf(str, n, fmt, ap) va_list ap; { - return (xxxprintf(&str, n, 0, fmt, ap)); + return xxxprintf(&str, n, 0, fmt, ap); } #endif /* HAVE_VSNPRINTF */ @@ -732,7 +732,7 @@ snprintf(str, n, fmt, va_alist) #endif ret = xxxprintf(&str, n, 0, fmt, ap); va_end(ap); - return (ret); + return ret; } #endif /* HAVE_SNPRINTF */ @@ -744,7 +744,7 @@ vasprintf(str, fmt, ap) va_list ap; { - return (xxxprintf(str, 0, 1, fmt, ap)); + return xxxprintf(str, 0, 1, fmt, ap); } #endif /* HAVE_VASPRINTF */ @@ -769,6 +769,6 @@ asprintf(str, fmt, va_alist) #endif ret = xxxprintf(str, 0, 1, fmt, ap); va_end(ap); - return (ret); + return ret; } #endif /* HAVE_ASPRINTF */ diff --git a/strerror.c b/strerror.c index fa2f6f639..e9da6d3cc 100644 --- a/strerror.c +++ b/strerror.c @@ -36,7 +36,7 @@ strerror(n) extern char *sys_errlist[]; if (n > 0 && n < sys_nerr) - return(sys_errlist[n]); + return sys_errlist[n]; errno = EINVAL; - return("Unknown error"); + return "Unknown error"; } diff --git a/strlcat.c b/strlcat.c index 6f94a0984..fb9727a86 100644 --- a/strlcat.c +++ b/strlcat.c @@ -47,7 +47,7 @@ strlcat(dst, src, siz) n = siz - dlen; if (n == 0) - return(dlen + strlen(s)); + return dlen + strlen(s); while (*s != '\0') { if (n != 1) { *d++ = *s; @@ -57,5 +57,5 @@ strlcat(dst, src, siz) } *d = '\0'; - return(dlen + (s - src)); /* count does not include NUL */ + return dlen + (s - src); /* count does not include NUL */ } diff --git a/strlcpy.c b/strlcpy.c index 175b137b7..b2f20f62d 100644 --- a/strlcpy.c +++ b/strlcpy.c @@ -52,5 +52,5 @@ strlcpy(dst, src, siz) ; } - return(s - src - 1); /* count does not include NUL */ + return s - src - 1; /* count does not include NUL */ } diff --git a/strsignal.c b/strsignal.c index 16da77633..303184d2f 100644 --- a/strsignal.c +++ b/strsignal.c @@ -40,6 +40,6 @@ strsignal(signo) int signo; { if (signo > 0 && signo < NSIG) - return((char *)my_sys_siglist[signo]); - return("Unknown signal"); + return (char *)my_sys_siglist[signo]; + return "Unknown signal"; } diff --git a/sudo.c b/sudo.c index 0dc263bc7..b9b814854 100644 --- a/sudo.c +++ b/sudo.c @@ -816,7 +816,7 @@ set_cmnd(sudo_mode) if (!runas_user && !runas_group) set_runaspw(def_runas_default); /* may have been updated above */ - return(rval); + return rval; } /* @@ -905,7 +905,7 @@ exec_setup(rbac_enabled, ttyname, ttyfd) rval = TRUE; done: - return(rval); + return rval; } /* @@ -961,7 +961,7 @@ run_command(path, argv, envp, uid, dowait) pw_delref(runas_pw); if (runas_gr != NULL) gr_delref(runas_gr); - return(exitcode); + return exitcode; } /* @@ -1041,7 +1041,7 @@ open_sudoers(sudoers, doedit, keepopen) } set_perms(PERM_ROOT); /* change back to root */ - return(fp); + return fp; } /* diff --git a/sudo_noexec.c b/sudo_noexec.c index 5f450858c..647e65382 100644 --- a/sudo_noexec.c +++ b/sudo_noexec.c @@ -45,7 +45,7 @@ extern int errno; #define DUMMY_BODY \ { \ errno = EACCES; \ - return(-1); \ + return -1; \ } #ifdef __STDC__ diff --git a/sudo_nss.c b/sudo_nss.c index 321390643..5b895eabe 100644 --- a/sudo_nss.c +++ b/sudo_nss.c @@ -100,7 +100,7 @@ nomatch: if (tq_empty(&snl)) tq_append(&snl, &sudo_nss_file); - return(&snl); + return &snl; } #else /* HAVE_LDAP && _PATH_NSSWITCH_CONF */ @@ -179,7 +179,7 @@ nomatch: if (tq_empty(&snl)) tq_append(&snl, &sudo_nss_file); - return(&snl); + return &snl; } # else /* !_PATH_NETSVC_CONF && !_PATH_NSSWITCH_CONF */ @@ -197,7 +197,7 @@ sudo_read_nss() # endif tq_append(&snl, &sudo_nss_file); - return(&snl); + return &snl; } # endif /* !HAVE_LDAP || !_PATH_NETSVC_CONF */ @@ -313,7 +313,7 @@ display_cmnd(snl, pw) tq_foreach_fwd(snl, nss) { if (nss->display_cmnd(nss, pw) == 0) - return(0); + return 0; } - return(1); + return 1; } diff --git a/sudoreplay.c b/sudoreplay.c index b60e95ff8..8a627b560 100644 --- a/sudoreplay.c +++ b/sudoreplay.c @@ -539,7 +539,7 @@ parse_expr(headp, argv) errorx(1, "unmatched ')' in expression"); if (node_stack[stack_top]) sn->next = node_stack[stack_top]->next; - return(av - argv + 1); + return av - argv + 1; bad: default: errorx(1, "unknown search term \"%s\"", *av); @@ -585,7 +585,7 @@ parse_expr(headp, argv) if (not) errorx(1, "illegal trailing \"!\""); - return(av - argv); + return av - argv; } static int @@ -643,7 +643,7 @@ match_expr(head, log) if (sn->negated) matched = !matched; } - return(matched); + return matched; } static int @@ -664,7 +664,7 @@ list_session_dir(pathbuf, re, user, tty) d = opendir(pathbuf); if (d == NULL && errno != ENOTDIR) { warning("cannot opendir %s", pathbuf); - return(-1); + return -1; } while ((dp = readdir(d)) != NULL) { if (NAMLEN(dp) != 2 || !isalnum((unsigned char)dp->d_name[0]) || @@ -749,7 +749,7 @@ list_session_dir(pathbuf, re, user, tty) printf("GROUP=%s ; ", li.runas_group); printf("TSID=%s ; COMMAND=%s\n", idstr, li.cmd); } - return(0); + return 0; } static int @@ -821,7 +821,7 @@ list_sessions(argc, argv, pattern, user, tty) closedir(d2); } closedir(d1); - return(0); + return 0; } /* diff --git a/term.c b/term.c index 59fd0bc21..4aa712848 100644 --- a/term.c +++ b/term.c @@ -112,10 +112,10 @@ term_restore(fd, flush) int flags = TCSASOFT; flags |= flush ? TCSAFLUSH : TCSADRAIN; if (tcsetattr(fd, flags, &oterm) != 0) - return(0); + return 0; changed = 0; } - return(1); + return 1; } int @@ -123,7 +123,7 @@ term_noecho(fd) int fd; { if (!changed && tcgetattr(fd, &oterm) != 0) - return(0); + return 0; (void) memcpy(&term, &oterm, sizeof(term)); CLR(term.c_lflag, ECHO|ECHONL); #ifdef VSTATUS @@ -131,9 +131,9 @@ term_noecho(fd) #endif if (tcsetattr(fd, TCSADRAIN|TCSASOFT, &term) == 0) { changed = 1; - return(1); + return 1; } - return(0); + return 0; } #if defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H) @@ -146,7 +146,7 @@ term_raw(fd, isig) struct termios term; if (!changed && tcgetattr(fd, &oterm) != 0) - return(0); + return 0; (void) memcpy(&term, &oterm, sizeof(term)); /* Set terminal to raw mode */ term.c_cc[VMIN] = 1; @@ -158,9 +158,9 @@ term_raw(fd, isig) SET(term.c_lflag, ISIG); if (tcsetattr(fd, TCSADRAIN|TCSASOFT, &term) == 0) { changed = 1; - return(1); + return 1; } - return(0); + return 0; } int @@ -168,7 +168,7 @@ term_cbreak(fd) int fd; { if (!changed && tcgetattr(fd, &oterm) != 0) - return(0); + return 0; (void) memcpy(&term, &oterm, sizeof(term)); /* Set terminal to half-cooked mode */ term.c_cc[VMIN] = 1; @@ -182,9 +182,9 @@ term_cbreak(fd) term_erase = term.c_cc[VERASE]; term_kill = term.c_cc[VKILL]; changed = 1; - return(1); + return 1; } - return(0); + return 0; } int @@ -195,11 +195,11 @@ term_copy(src, dst) struct termios tt; if (tcgetattr(src, &tt) != 0) - return(0); + return 0; /* XXX - add TCSANOW compat define */ if (tcsetattr(dst, TCSANOW|TCSASOFT, &tt) != 0) - return(0); - return(1); + return 0; + return 1; } #else /* SGTTY */ @@ -210,7 +210,7 @@ term_raw(fd, isig) int isig; { if (!changed && ioctl(fd, TIOCGETP, &oterm) != 0) - return(0); + return 0; (void) memcpy(&term, &oterm, sizeof(term)); /* Set terminal to raw mode */ /* XXX - how to support isig? */ @@ -218,9 +218,9 @@ term_raw(fd, isig) SET(term.sg_flags, RAW); if (ioctl(fd, TIOCSETP, &term) == 0) { changed = 1; - return(1); + return 1; } - return(0); + return 0; } int @@ -228,7 +228,7 @@ term_cbreak(fd) int fd; { if (!changed && ioctl(fd, TIOCGETP, &oterm) != 0) - return(0); + return 0; (void) memcpy(&term, &oterm, sizeof(term)); /* Set terminal to half-cooked mode */ CLR(term.c_lflag, ECHO); @@ -237,9 +237,9 @@ term_cbreak(fd) term_erase = term.sg_erase; term_kill = term.sg_kill; changed = 1; - return(1); + return 1; } - return(0); + return 0; } int @@ -255,14 +255,14 @@ term_copy(src, dst) if (ioctl(src, TIOCGETP, &b) != 0 || ioctl(src, TIOCGETC, &tc) != 0 || ioctl(src, TIOCGETD, &l) != 0 || ioctl(src, TIOCGLTC, &lc) != 0 || ioctl(src, TIOCLGET, &lb)) { - return(0); + return 0; } if (ioctl(dst, TIOCSETP, &b) != 0 || ioctl(dst, TIOCSETC, &tc) != 0 || ioctl(dst, TIOCSLTC, &lc) != 0 || ioctl(dst, TIOCLSET, &lb) != 0 || ioctl(dst, TIOCSETD, &l) != 0) { - return(0); + return 0; } - return(1); + return 1; } #endif diff --git a/testsudoers.c b/testsudoers.c index 45d4cf74d..c859fca30 100644 --- a/testsudoers.c +++ b/testsudoers.c @@ -325,7 +325,7 @@ char * sudo_getepw(pw) const struct passwd *pw; { - return (pw->pw_passwd); + return pw->pw_passwd; } void @@ -340,7 +340,7 @@ open_sudoers(path, isdir, keepopen) int isdir; int *keepopen; { - return(fopen(path, "r")); + return fopen(path, "r"); } void @@ -353,7 +353,7 @@ int set_perms(perm) int perm; { - return(1); + return 1; } void @@ -453,7 +453,7 @@ print_alias(v1, v2) fputs(m->name, stdout); } putchar('\n'); - return(0); + return 0; } void diff --git a/tgetpass.c b/tgetpass.c index 44bb062f5..4fca589a3 100644 --- a/tgetpass.c +++ b/tgetpass.c @@ -80,7 +80,7 @@ tgetpass(prompt, timeout, flags) /* If using a helper program to get the password, run it instead. */ if (ISSET(flags, TGP_ASKPASS) && user_askpass) - return(sudo_askpass(prompt)); + return sudo_askpass(prompt); restart: for (i = 0; i < NSIG; i++) @@ -180,7 +180,7 @@ restore: if (save_errno) errno = save_errno; - return(pass); + return pass; } /* @@ -228,7 +228,7 @@ sudo_askpass(prompt) (void) close(pfd[0]); (void) sigaction(SIGPIPE, &saved_sa_pipe, NULL); - return(pass); + return pass; } extern int term_erase, term_kill; @@ -247,7 +247,7 @@ getln(fd, buf, bufsiz, feedback) if (left == 0) { errno = EINVAL; - return(NULL); /* sanity */ + return NULL; /* sanity */ } while (--left) { @@ -287,7 +287,7 @@ getln(fd, buf, bufsiz, feedback) } } - return(nr == 1 ? buf : NULL); + return nr == 1 ? buf : NULL; } static void @@ -305,5 +305,5 @@ tty_present() if ((fd = open(_PATH_TTY, O_RDWR|O_NOCTTY)) != -1) close(fd); - return(fd != -1); + return fd != -1; } diff --git a/timestr.c b/timestr.c index d2fce9c45..9369e8c4a 100644 --- a/timestr.c +++ b/timestr.c @@ -55,7 +55,7 @@ get_timestr(tstamp, log_year) /* strftime() does not guarantee to NUL-terminate so we must check. */ buf[sizeof(buf) - 1] = '\0'; if (strftime(buf, sizeof(buf), s, timeptr) && buf[sizeof(buf) - 1] == '\0') - return(buf); + return buf; #endif /* HAVE_STRFTIME */ @@ -65,5 +65,5 @@ get_timestr(tstamp, log_year) else s[15] = '\0'; /* don't care about year */ - return(s); + return s; } diff --git a/toke.c b/toke.c index b75202f4c..b35f3d69f 100644 --- a/toke.c +++ b/toke.c @@ -1755,7 +1755,7 @@ YY_RULE_SETUP LEXTRACE("DEFVAR "); if (!fill(yytext, yyleng)) yyterminate(); - return(DEFVAR); + return DEFVAR; } YY_BREAK @@ -1765,7 +1765,7 @@ YY_RULE_SETUP { BEGIN STARTDEFS; LEXTRACE(", "); - return(','); + return ','; } /* return ',' */ YY_BREAK case 4: @@ -1773,7 +1773,7 @@ YY_RULE_SETUP #line 146 "toke.l" { LEXTRACE("= "); - return('='); + return '='; } /* return '=' */ YY_BREAK case 5: @@ -1781,7 +1781,7 @@ YY_RULE_SETUP #line 151 "toke.l" { LEXTRACE("+= "); - return('+'); + return '+'; } /* return '+' */ YY_BREAK case 6: @@ -1789,7 +1789,7 @@ YY_RULE_SETUP #line 156 "toke.l" { LEXTRACE("-= "); - return('-'); + return '-'; } /* return '-' */ YY_BREAK case 7: @@ -1808,7 +1808,7 @@ YY_RULE_SETUP LEXTRACE("WORD(2) "); if (!fill(yytext, yyleng)) yyterminate(); - return(WORD); + return WORD; } YY_BREAK @@ -1828,7 +1828,7 @@ YY_RULE_SETUP { LEXTRACE("ENDSTR "); BEGIN INDEFS; - return(WORD); + return WORD; } YY_BREAK case 11: @@ -1879,7 +1879,7 @@ YY_RULE_SETUP { BEGIN INITIAL; yyless(0); - return(COMMAND); + return COMMAND; } /* end of command line args */ YY_BREAK case 16: @@ -1941,22 +1941,22 @@ YY_RULE_SETUP case ':': yyless(n); LEXTRACE("DEFAULTS_USER "); - return(DEFAULTS_USER); + return DEFAULTS_USER; case '>': yyless(n); LEXTRACE("DEFAULTS_RUNAS "); - return(DEFAULTS_RUNAS); + return DEFAULTS_RUNAS; case '@': yyless(n); LEXTRACE("DEFAULTS_HOST "); - return(DEFAULTS_HOST); + return DEFAULTS_HOST; case '!': yyless(n); LEXTRACE("DEFAULTS_CMND "); - return(DEFAULTS_CMND); + return DEFAULTS_CMND; default: LEXTRACE("DEFAULTS "); - return(DEFAULTS); + return DEFAULTS; } } YY_BREAK @@ -1970,16 +1970,16 @@ YY_RULE_SETUP switch (yytext[n]) { case 'H': LEXTRACE("HOSTALIAS "); - return(HOSTALIAS); + return HOSTALIAS; case 'C': LEXTRACE("CMNDALIAS "); - return(CMNDALIAS); + return CMNDALIAS; case 'U': LEXTRACE("USERALIAS "); - return(USERALIAS); + return USERALIAS; case 'R': LEXTRACE("RUNASALIAS "); - return(RUNASALIAS); + return RUNASALIAS; } } YY_BREAK @@ -1989,7 +1989,7 @@ YY_RULE_SETUP { /* cmnd does not require passwd for this user */ LEXTRACE("NOPASSWD "); - return(NOPASSWD); + return NOPASSWD; } YY_BREAK case 22: @@ -1998,7 +1998,7 @@ YY_RULE_SETUP { /* cmnd requires passwd for this user */ LEXTRACE("PASSWD "); - return(PASSWD); + return PASSWD; } YY_BREAK case 23: @@ -2006,7 +2006,7 @@ YY_RULE_SETUP #line 322 "toke.l" { LEXTRACE("NOEXEC "); - return(NOEXEC); + return NOEXEC; } YY_BREAK case 24: @@ -2014,7 +2014,7 @@ YY_RULE_SETUP #line 327 "toke.l" { LEXTRACE("EXEC "); - return(EXEC); + return EXEC; } YY_BREAK case 25: @@ -2022,7 +2022,7 @@ YY_RULE_SETUP #line 332 "toke.l" { LEXTRACE("SETENV "); - return(SETENV); + return SETENV; } YY_BREAK case 26: @@ -2030,7 +2030,7 @@ YY_RULE_SETUP #line 337 "toke.l" { LEXTRACE("NOSETENV "); - return(NOSETENV); + return NOSETENV; } YY_BREAK case 27: @@ -2038,7 +2038,7 @@ YY_RULE_SETUP #line 342 "toke.l" { LEXTRACE("LOG_OUTPUT "); - return(LOG_OUTPUT); + return LOG_OUTPUT; } YY_BREAK case 28: @@ -2046,7 +2046,7 @@ YY_RULE_SETUP #line 347 "toke.l" { LEXTRACE("NOLOG_OUTPUT "); - return(NOLOG_OUTPUT); + return NOLOG_OUTPUT; } YY_BREAK case 29: @@ -2054,7 +2054,7 @@ YY_RULE_SETUP #line 352 "toke.l" { LEXTRACE("LOG_INPUT "); - return(LOG_INPUT); + return LOG_INPUT; } YY_BREAK case 30: @@ -2062,7 +2062,7 @@ YY_RULE_SETUP #line 357 "toke.l" { LEXTRACE("NOLOG_INPUT "); - return(NOLOG_INPUT); + return NOLOG_INPUT; } YY_BREAK case 31: @@ -2073,7 +2073,7 @@ YY_RULE_SETUP if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("NETGROUP "); - return(NETGROUP); + return NETGROUP; } YY_BREAK case 32: @@ -2084,7 +2084,7 @@ YY_RULE_SETUP if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("USERGROUP "); - return(USERGROUP); + return USERGROUP; } YY_BREAK case 33: @@ -2094,7 +2094,7 @@ YY_RULE_SETUP if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("NTWKADDR "); - return(NTWKADDR); + return NTWKADDR; } YY_BREAK case 34: @@ -2104,7 +2104,7 @@ YY_RULE_SETUP if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("NTWKADDR "); - return(NTWKADDR); + return NTWKADDR; } YY_BREAK case 35: @@ -2113,12 +2113,12 @@ YY_RULE_SETUP { if (!ipv6_valid(yytext)) { LEXTRACE("ERROR "); - return(ERROR); + return ERROR; } if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("NTWKADDR "); - return(NTWKADDR); + return NTWKADDR; } YY_BREAK case 36: @@ -2127,12 +2127,12 @@ YY_RULE_SETUP { if (!ipv6_valid(yytext)) { LEXTRACE("ERROR "); - return(ERROR); + return ERROR; } if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("NTWKADDR "); - return(NTWKADDR); + return NTWKADDR; } YY_BREAK case 37: @@ -2141,23 +2141,23 @@ YY_RULE_SETUP { if (strcmp(yytext, "ALL") == 0) { LEXTRACE("ALL "); - return(ALL); + return ALL; } #ifdef HAVE_SELINUX /* XXX - restrict type/role to initial state */ if (strcmp(yytext, "TYPE") == 0) { LEXTRACE("TYPE "); - return(TYPE); + return TYPE; } if (strcmp(yytext, "ROLE") == 0) { LEXTRACE("ROLE "); - return(ROLE); + return ROLE; } #endif /* HAVE_SELINUX */ if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("ALIAS "); - return(ALIAS); + return ALIAS; } YY_BREAK case 38: @@ -2168,7 +2168,7 @@ YY_RULE_SETUP if (!fill_cmnd(yytext, yyleng)) yyterminate(); LEXTRACE("COMMAND "); - return(COMMAND); + return COMMAND; } YY_BREAK case 39: @@ -2190,7 +2190,7 @@ YY_RULE_SETUP LEXTRACE("COMMAND "); if (!fill_cmnd(yytext, yyleng)) yyterminate(); - return(COMMAND); + return COMMAND; } else { BEGIN GOTCMND; LEXTRACE("COMMAND "); @@ -2209,13 +2209,13 @@ YY_RULE_SETUP switch (yytext[1]) { case '%': LEXTRACE("USERGROUP "); - return(USERGROUP); + return USERGROUP; case '+': LEXTRACE("NETGROUP "); - return(NETGROUP); + return NETGROUP; default: LEXTRACE("WORD(4) "); - return(WORD); + return WORD; } } YY_BREAK @@ -2227,7 +2227,7 @@ YY_RULE_SETUP if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("WORD(5) "); - return(WORD); + return WORD; } YY_BREAK case 43: @@ -2235,7 +2235,7 @@ YY_RULE_SETUP #line 491 "toke.l" { LEXTRACE("( "); - return ('('); + return '('; } YY_BREAK case 44: @@ -2243,7 +2243,7 @@ YY_RULE_SETUP #line 496 "toke.l" { LEXTRACE(") "); - return(')'); + return ')'; } YY_BREAK case 45: @@ -2251,7 +2251,7 @@ YY_RULE_SETUP #line 501 "toke.l" { LEXTRACE(", "); - return(','); + return ','; } /* return ',' */ YY_BREAK case 46: @@ -2259,7 +2259,7 @@ YY_RULE_SETUP #line 506 "toke.l" { LEXTRACE("= "); - return('='); + return '='; } /* return '=' */ YY_BREAK case 47: @@ -2267,7 +2267,7 @@ YY_RULE_SETUP #line 511 "toke.l" { LEXTRACE(": "); - return(':'); + return ':'; } /* return ':' */ YY_BREAK case 48: @@ -2275,7 +2275,7 @@ YY_RULE_SETUP #line 516 "toke.l" { if (yyleng % 2 == 1) - return('!'); /* return '!' */ + return '!'; /* return '!' */ } YY_BREAK case 49: @@ -2285,7 +2285,7 @@ YY_RULE_SETUP BEGIN INITIAL; ++sudolineno; LEXTRACE("\n"); - return(COMMENT); + return COMMENT; } /* return newline */ YY_BREAK case 50: @@ -2311,7 +2311,7 @@ YY_RULE_SETUP BEGIN INITIAL; ++sudolineno; LEXTRACE("\n"); - return(COMMENT); + return COMMENT; } /* comment, not uid/gid */ YY_BREAK case 53: @@ -2319,7 +2319,7 @@ YY_RULE_SETUP #line 545 "toke.l" { LEXTRACE("ERROR "); - return(ERROR); + return ERROR; } /* parse error */ YY_BREAK case YY_STATE_EOF(INITIAL): @@ -2333,7 +2333,7 @@ case YY_STATE_EOF(INSTR): if (YY_START != INITIAL) { BEGIN INITIAL; LEXTRACE("ERROR "); - return(ERROR); + return ERROR; } if (!pop_include()) yyterminate(); @@ -3280,7 +3280,7 @@ hexchar(s) s++; } } - return((unsigned char)result); + return (unsigned char)result; } static int @@ -3293,7 +3293,7 @@ _fill(src, len, olen) dst = olen ? realloc(yylval.string, olen + len + 1) : malloc(len + 1); if (dst == NULL) { yyerror("unable to allocate memory"); - return(FALSE); + return FALSE; } yylval.string = dst; @@ -3317,7 +3317,7 @@ _fill(src, len, olen) } } *dst = '\0'; - return(TRUE); + return TRUE; } static int @@ -3330,7 +3330,7 @@ append(src, len) if (yylval.string != NULL) olen = strlen(yylval.string); - return(_fill(src, len, olen)); + return _fill(src, len, olen); } #define SPECIAL(c) \ @@ -3349,7 +3349,7 @@ fill_cmnd(src, len) dst = yylval.command.cmnd = (char *) malloc(len + 1); if (yylval.command.cmnd == NULL) { yyerror("unable to allocate memory"); - return(FALSE); + return FALSE; } /* Copy the string and collapse any escaped sudo-specific characters. */ @@ -3362,7 +3362,7 @@ fill_cmnd(src, len) *dst = '\0'; yylval.command.args = NULL; - return(TRUE); + return TRUE; } static int @@ -3391,7 +3391,7 @@ fill_args(s, len, addspace) if (p == NULL) { efree(yylval.command.args); yyerror("unable to allocate memory"); - return(FALSE); + return FALSE; } else yylval.command.args = p; } @@ -3402,10 +3402,10 @@ fill_args(s, len, addspace) *p++ = ' '; if (strlcpy(p, s, arg_size - (p - yylval.command.args)) != len) { yyerror("fill_args: buffer overflow"); /* paranoia */ - return(FALSE); + return FALSE; } arg_len = new_len; - return(TRUE); + return TRUE; } struct path_list { @@ -3429,7 +3429,7 @@ pl_compare(v1, v2) const struct path_list * const *p1 = v1; const struct path_list * const *p2 = v2; - return(strcmp((*p1)->path, (*p2)->path)); + return strcmp((*p1)->path, (*p2)->path); } static char * @@ -3447,7 +3447,7 @@ switch_dir(stack, dirpath) if (!(dir = opendir(dirpath))) { yyerror(dirpath); - return(NULL); + return NULL; } while ((dent = readdir(dir))) { /* Ignore files that end in '~' or have a '.' in them. */ @@ -3505,7 +3505,7 @@ switch_dir(stack, dirpath) } done: efree(dirpath); - return(path); + return path; bad: while (first != NULL) { pl = first; @@ -3516,7 +3516,7 @@ bad: efree(sorted); efree(dirpath); efree(path); - return(NULL); + return NULL; } #define MAX_SUDOERS_DEPTH 128 @@ -3561,26 +3561,26 @@ _push_include(path, isdir) if (idepth >= istacksize) { if (idepth > MAX_SUDOERS_DEPTH) { yyerror("too many levels of includes"); - return(FALSE); + return FALSE; } istacksize += SUDOERS_STACK_INCREMENT; istack = (struct include_stack *) realloc(istack, sizeof(*istack) * istacksize); if (istack == NULL) { yyerror("unable to allocate memory"); - return(FALSE); + return FALSE; } } if (isdir) { if (!(path = switch_dir(&istack[idepth], path))) { /* switch_dir() called yyerror() for us */ - return(FALSE); + return FALSE; } while ((fp = open_sudoers(path, FALSE, &keepopen)) == NULL) { /* Unable to open path in includedir, go to next one, if any. */ efree(path); if ((pl = istack[idepth].more) == NULL) - return(FALSE); + return FALSE; path = pl->path; istack[idepth].more = pl->next; efree(pl); @@ -3588,7 +3588,7 @@ _push_include(path, isdir) } else { if ((fp = open_sudoers(path, TRUE, &keepopen)) == NULL) { yyerror(path); - return(FALSE); + return FALSE; } istack[idepth].more = NULL; } @@ -3602,7 +3602,7 @@ _push_include(path, isdir) sudoers = path; yy_switch_to_buffer(yy_create_buffer(fp, YY_BUF_SIZE)); - return(TRUE); + return TRUE; } static int @@ -3612,7 +3612,7 @@ pop_include() FILE *fp; if (idepth == 0) - return(FALSE); + return FALSE; if (!keepopen) fclose(YY_CURRENT_BUFFER->yy_input_file); @@ -3643,7 +3643,7 @@ pop_include() sudolineno = istack[idepth].lineno; keepopen = istack[idepth].keepopen; } - return(TRUE); + return TRUE; } static char * @@ -3696,7 +3696,7 @@ parse_include(base) if (*ep != '\0') yyless((int)(ep - base)); - return(path); + return path; } /* @@ -3719,5 +3719,5 @@ ipv6_valid(s) nmatch = 0; /* reset if we hit netmask */ } - return (nmatch <= 1); + return nmatch <= 1; } diff --git a/toke.l b/toke.l index d5ece7e47..8375495c4 100644 --- a/toke.l +++ b/toke.l @@ -133,29 +133,29 @@ DEFVAR [a-z_]+ LEXTRACE("DEFVAR "); if (!fill(yytext, yyleng)) yyterminate(); - return(DEFVAR); + return DEFVAR; } { , { BEGIN STARTDEFS; LEXTRACE(", "); - return(','); + return ','; } /* return ',' */ = { LEXTRACE("= "); - return('='); + return '='; } /* return '=' */ \+= { LEXTRACE("+= "); - return('+'); + return '+'; } /* return '+' */ -= { LEXTRACE("-= "); - return('-'); + return '-'; } /* return '-' */ \" { @@ -168,7 +168,7 @@ DEFVAR [a-z_]+ LEXTRACE("WORD(2) "); if (!fill(yytext, yyleng)) yyterminate(); - return(WORD); + return WORD; } } @@ -182,7 +182,7 @@ DEFVAR [a-z_]+ \" { LEXTRACE("ENDSTR "); BEGIN INDEFS; - return(WORD); + return WORD; } \\ { @@ -218,7 +218,7 @@ DEFVAR [a-z_]+ [#:\,=\n] { BEGIN INITIAL; yyless(0); - return(COMMAND); + return COMMAND; } /* end of command line args */ [^#\\:, \t\n]+ { @@ -268,22 +268,22 @@ DEFVAR [a-z_]+ case ':': yyless(n); LEXTRACE("DEFAULTS_USER "); - return(DEFAULTS_USER); + return DEFAULTS_USER; case '>': yyless(n); LEXTRACE("DEFAULTS_RUNAS "); - return(DEFAULTS_RUNAS); + return DEFAULTS_RUNAS; case '@': yyless(n); LEXTRACE("DEFAULTS_HOST "); - return(DEFAULTS_HOST); + return DEFAULTS_HOST; case '!': yyless(n); LEXTRACE("DEFAULTS_CMND "); - return(DEFAULTS_CMND); + return DEFAULTS_CMND; default: LEXTRACE("DEFAULTS "); - return(DEFAULTS); + return DEFAULTS; } } @@ -294,69 +294,69 @@ DEFVAR [a-z_]+ switch (yytext[n]) { case 'H': LEXTRACE("HOSTALIAS "); - return(HOSTALIAS); + return HOSTALIAS; case 'C': LEXTRACE("CMNDALIAS "); - return(CMNDALIAS); + return CMNDALIAS; case 'U': LEXTRACE("USERALIAS "); - return(USERALIAS); + return USERALIAS; case 'R': LEXTRACE("RUNASALIAS "); - return(RUNASALIAS); + return RUNASALIAS; } } NOPASSWD[[:blank:]]*: { /* cmnd does not require passwd for this user */ LEXTRACE("NOPASSWD "); - return(NOPASSWD); + return NOPASSWD; } PASSWD[[:blank:]]*: { /* cmnd requires passwd for this user */ LEXTRACE("PASSWD "); - return(PASSWD); + return PASSWD; } NOEXEC[[:blank:]]*: { LEXTRACE("NOEXEC "); - return(NOEXEC); + return NOEXEC; } EXEC[[:blank:]]*: { LEXTRACE("EXEC "); - return(EXEC); + return EXEC; } SETENV[[:blank:]]*: { LEXTRACE("SETENV "); - return(SETENV); + return SETENV; } NOSETENV[[:blank:]]*: { LEXTRACE("NOSETENV "); - return(NOSETENV); + return NOSETENV; } LOG_OUTPUT[[:blank:]]*: { LEXTRACE("LOG_OUTPUT "); - return(LOG_OUTPUT); + return LOG_OUTPUT; } NOLOG_OUTPUT[[:blank:]]*: { LEXTRACE("NOLOG_OUTPUT "); - return(NOLOG_OUTPUT); + return NOLOG_OUTPUT; } LOG_INPUT[[:blank:]]*: { LEXTRACE("LOG_INPUT "); - return(LOG_INPUT); + return LOG_INPUT; } NOLOG_INPUT[[:blank:]]*: { LEXTRACE("NOLOG_INPUT "); - return(NOLOG_INPUT); + return NOLOG_INPUT; } \+{WORD} { @@ -364,7 +364,7 @@ NOLOG_INPUT[[:blank:]]*: { if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("NETGROUP "); - return(NETGROUP); + return NETGROUP; } \%:?{WORD} { @@ -372,65 +372,65 @@ NOLOG_INPUT[[:blank:]]*: { if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("USERGROUP "); - return(USERGROUP); + return USERGROUP; } {IPV4ADDR}(\/{IPV4ADDR})? { if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("NTWKADDR "); - return(NTWKADDR); + return NTWKADDR; } {IPV4ADDR}\/([12][0-9]*|3[0-2]*) { if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("NTWKADDR "); - return(NTWKADDR); + return NTWKADDR; } {IPV6ADDR}(\/{IPV6ADDR})? { if (!ipv6_valid(yytext)) { LEXTRACE("ERROR "); - return(ERROR); + return ERROR; } if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("NTWKADDR "); - return(NTWKADDR); + return NTWKADDR; } {IPV6ADDR}\/([0-9]|[1-9][0-9]|1[01][0-9]|12[0-8]) { if (!ipv6_valid(yytext)) { LEXTRACE("ERROR "); - return(ERROR); + return ERROR; } if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("NTWKADDR "); - return(NTWKADDR); + return NTWKADDR; } [[:upper:]][[:upper:][:digit:]_]* { if (strcmp(yytext, "ALL") == 0) { LEXTRACE("ALL "); - return(ALL); + return ALL; } #ifdef HAVE_SELINUX /* XXX - restrict type/role to initial state */ if (strcmp(yytext, "TYPE") == 0) { LEXTRACE("TYPE "); - return(TYPE); + return TYPE; } if (strcmp(yytext, "ROLE") == 0) { LEXTRACE("ROLE "); - return(ROLE); + return ROLE; } #endif /* HAVE_SELINUX */ if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("ALIAS "); - return(ALIAS); + return ALIAS; } ({PATH}|sudoedit) { @@ -438,7 +438,7 @@ NOLOG_INPUT[[:blank:]]*: { if (!fill_cmnd(yytext, yyleng)) yyterminate(); LEXTRACE("COMMAND "); - return(COMMAND); + return COMMAND; } sudoedit { @@ -454,7 +454,7 @@ sudoedit { LEXTRACE("COMMAND "); if (!fill_cmnd(yytext, yyleng)) yyterminate(); - return(COMMAND); + return COMMAND; } else { BEGIN GOTCMND; LEXTRACE("COMMAND "); @@ -470,13 +470,13 @@ sudoedit { switch (yytext[1]) { case '%': LEXTRACE("USERGROUP "); - return(USERGROUP); + return USERGROUP; case '+': LEXTRACE("NETGROUP "); - return(NETGROUP); + return NETGROUP; default: LEXTRACE("WORD(4) "); - return(WORD); + return WORD; } } @@ -485,44 +485,44 @@ sudoedit { if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("WORD(5) "); - return(WORD); + return WORD; } \( { LEXTRACE("( "); - return ('('); + return '('; } \) { LEXTRACE(") "); - return(')'); + return ')'; } , { LEXTRACE(", "); - return(','); + return ','; } /* return ',' */ = { LEXTRACE("= "); - return('='); + return '='; } /* return '=' */ : { LEXTRACE(": "); - return(':'); + return ':'; } /* return ':' */ <*>!+ { if (yyleng % 2 == 1) - return('!'); /* return '!' */ + return '!'; /* return '!' */ } <*>\n { BEGIN INITIAL; ++sudolineno; LEXTRACE("\n"); - return(COMMENT); + return COMMENT; } /* return newline */ <*>[[:blank:]]+ { /* throw away space/tabs */ @@ -539,19 +539,19 @@ sudoedit { BEGIN INITIAL; ++sudolineno; LEXTRACE("\n"); - return(COMMENT); + return COMMENT; } /* comment, not uid/gid */ <*>. { LEXTRACE("ERROR "); - return(ERROR); + return ERROR; } /* parse error */ <*><> { if (YY_START != INITIAL) { BEGIN INITIAL; LEXTRACE("ERROR "); - return(ERROR); + return ERROR; } if (!pop_include()) yyterminate(); @@ -601,7 +601,7 @@ hexchar(s) s++; } } - return((unsigned char)result); + return (unsigned char)result; } static int @@ -614,7 +614,7 @@ _fill(src, len, olen) dst = olen ? realloc(yylval.string, olen + len + 1) : malloc(len + 1); if (dst == NULL) { yyerror("unable to allocate memory"); - return(FALSE); + return FALSE; } yylval.string = dst; @@ -638,7 +638,7 @@ _fill(src, len, olen) } } *dst = '\0'; - return(TRUE); + return TRUE; } static int @@ -651,7 +651,7 @@ append(src, len) if (yylval.string != NULL) olen = strlen(yylval.string); - return(_fill(src, len, olen)); + return _fill(src, len, olen); } #define SPECIAL(c) \ @@ -670,7 +670,7 @@ fill_cmnd(src, len) dst = yylval.command.cmnd = (char *) malloc(len + 1); if (yylval.command.cmnd == NULL) { yyerror("unable to allocate memory"); - return(FALSE); + return FALSE; } /* Copy the string and collapse any escaped sudo-specific characters. */ @@ -683,7 +683,7 @@ fill_cmnd(src, len) *dst = '\0'; yylval.command.args = NULL; - return(TRUE); + return TRUE; } static int @@ -712,7 +712,7 @@ fill_args(s, len, addspace) if (p == NULL) { efree(yylval.command.args); yyerror("unable to allocate memory"); - return(FALSE); + return FALSE; } else yylval.command.args = p; } @@ -723,10 +723,10 @@ fill_args(s, len, addspace) *p++ = ' '; if (strlcpy(p, s, arg_size - (p - yylval.command.args)) != len) { yyerror("fill_args: buffer overflow"); /* paranoia */ - return(FALSE); + return FALSE; } arg_len = new_len; - return(TRUE); + return TRUE; } struct path_list { @@ -750,7 +750,7 @@ pl_compare(v1, v2) const struct path_list * const *p1 = v1; const struct path_list * const *p2 = v2; - return(strcmp((*p1)->path, (*p2)->path)); + return strcmp((*p1)->path, (*p2)->path); } static char * @@ -768,7 +768,7 @@ switch_dir(stack, dirpath) if (!(dir = opendir(dirpath))) { yyerror(dirpath); - return(NULL); + return NULL; } while ((dent = readdir(dir))) { /* Ignore files that end in '~' or have a '.' in them. */ @@ -826,7 +826,7 @@ switch_dir(stack, dirpath) } done: efree(dirpath); - return(path); + return path; bad: while (first != NULL) { pl = first; @@ -837,7 +837,7 @@ bad: efree(sorted); efree(dirpath); efree(path); - return(NULL); + return NULL; } #define MAX_SUDOERS_DEPTH 128 @@ -882,26 +882,26 @@ _push_include(path, isdir) if (idepth >= istacksize) { if (idepth > MAX_SUDOERS_DEPTH) { yyerror("too many levels of includes"); - return(FALSE); + return FALSE; } istacksize += SUDOERS_STACK_INCREMENT; istack = (struct include_stack *) realloc(istack, sizeof(*istack) * istacksize); if (istack == NULL) { yyerror("unable to allocate memory"); - return(FALSE); + return FALSE; } } if (isdir) { if (!(path = switch_dir(&istack[idepth], path))) { /* switch_dir() called yyerror() for us */ - return(FALSE); + return FALSE; } while ((fp = open_sudoers(path, FALSE, &keepopen)) == NULL) { /* Unable to open path in includedir, go to next one, if any. */ efree(path); if ((pl = istack[idepth].more) == NULL) - return(FALSE); + return FALSE; path = pl->path; istack[idepth].more = pl->next; efree(pl); @@ -909,7 +909,7 @@ _push_include(path, isdir) } else { if ((fp = open_sudoers(path, TRUE, &keepopen)) == NULL) { yyerror(path); - return(FALSE); + return FALSE; } istack[idepth].more = NULL; } @@ -923,7 +923,7 @@ _push_include(path, isdir) sudoers = path; yy_switch_to_buffer(yy_create_buffer(fp, YY_BUF_SIZE)); - return(TRUE); + return TRUE; } static int @@ -933,7 +933,7 @@ pop_include() FILE *fp; if (idepth == 0) - return(FALSE); + return FALSE; if (!keepopen) fclose(YY_CURRENT_BUFFER->yy_input_file); @@ -964,7 +964,7 @@ pop_include() sudolineno = istack[idepth].lineno; keepopen = istack[idepth].keepopen; } - return(TRUE); + return TRUE; } static char * @@ -1017,7 +1017,7 @@ parse_include(base) if (*ep != '\0') yyless((int)(ep - base)); - return(path); + return path; } /* @@ -1040,5 +1040,5 @@ ipv6_valid(s) nmatch = 0; /* reset if we hit netmask */ } - return (nmatch <= 1); + return nmatch <= 1; } diff --git a/tsgetgrpw.c b/tsgetgrpw.c index b843df4be..5b38298c5 100644 --- a/tsgetgrpw.c +++ b/tsgetgrpw.c @@ -104,38 +104,38 @@ getpwent() char *cp, *colon; if ((colon = fgets(pwbuf, sizeof(pwbuf), pwf)) == NULL) - return(NULL); + return NULL; zero_bytes(&pw, sizeof(pw)); if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; pw.pw_name = cp; if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; pw.pw_passwd = cp; if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; pw.pw_uid = atoi(cp); if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; pw.pw_gid = atoi(cp); if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; pw.pw_gecos = cp; if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; pw.pw_dir = cp; pw.pw_shell = colon; len = strlen(colon); if (len > 0 && colon[len - 1] == '\n') colon[len - 1] = '\0'; - return(&pw); + return &pw; } struct passwd * @@ -146,7 +146,7 @@ getpwnam(name) if (pwf == NULL) { if ((pwf = fopen(pwfile, "r")) == NULL) - return(NULL); + return NULL; fcntl(fileno(pwf), F_SETFD, FD_CLOEXEC); } else { rewind(pwf); @@ -159,7 +159,7 @@ getpwnam(name) fclose(pwf); pwf = NULL; } - return(pw); + return pw; } struct passwd * @@ -170,7 +170,7 @@ getpwuid(uid) if (pwf == NULL) { if ((pwf = fopen(pwfile, "r")) == NULL) - return(NULL); + return NULL; fcntl(fileno(pwf), F_SETFD, FD_CLOEXEC); } else { rewind(pwf); @@ -183,7 +183,7 @@ getpwuid(uid) fclose(pwf); pwf = NULL; } - return(pw); + return pw; } void @@ -228,19 +228,19 @@ getgrent() int n; if ((colon = fgets(grbuf, sizeof(grbuf), grf)) == NULL) - return(NULL); + return NULL; zero_bytes(&gr, sizeof(gr)); if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; gr.gr_name = cp; if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; gr.gr_passwd = cp; if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; gr.gr_gid = atoi(cp); len = strlen(colon); @@ -256,7 +256,7 @@ getgrent() gr.gr_mem[n++] = NULL; } else gr.gr_mem = NULL; - return(&gr); + return &gr; } struct group * @@ -267,7 +267,7 @@ getgrnam(name) if (grf == NULL) { if ((grf = fopen(grfile, "r")) == NULL) - return(NULL); + return NULL; fcntl(fileno(grf), F_SETFD, FD_CLOEXEC); } else { rewind(grf); @@ -280,7 +280,7 @@ getgrnam(name) fclose(grf); grf = NULL; } - return(gr); + return gr; } struct group * @@ -291,7 +291,7 @@ getgrgid(gid) if (grf == NULL) { if ((grf = fopen(grfile, "r")) == NULL) - return(NULL); + return NULL; fcntl(fileno(grf), F_SETFD, FD_CLOEXEC); } else { rewind(grf); @@ -304,5 +304,5 @@ getgrgid(gid) fclose(grf); grf = NULL; } - return(gr); + return gr; } diff --git a/utimes.c b/utimes.c index 2f1e0e044..a39a1befd 100644 --- a/utimes.c +++ b/utimes.c @@ -45,9 +45,9 @@ utimes(file, times) utb.actime = (time_t)(times[0].tv_sec + times[0].tv_usec / 1000000); utb.modtime = (time_t)(times[1].tv_sec + times[1].tv_usec / 1000000); - return(utime(file, &utb)); + return utime(file, &utb); } else - return(utime(file, NULL)); + return utime(file, NULL); } #endif /* !HAVE_UTIMES */ @@ -65,8 +65,8 @@ futimes(fd, times) utb.actime = (time_t)(times[0].tv_sec + times[0].tv_usec / 1000000); utb.modtime = (time_t)(times[1].tv_sec + times[1].tv_usec / 1000000); - return(futime(fd, &utb)); + return futime(fd, &utb); } else - return(futime(fd, NULL)); + return futime(fd, NULL); } #endif /* HAVE_FUTIME */ diff --git a/vasgroups.c b/vasgroups.c index 158c03909..867967bf8 100644 --- a/vasgroups.c +++ b/vasgroups.c @@ -165,7 +165,7 @@ FINISHED: /* cleanups */ if( vas_group ) v_group_free( sudo_vas_ctx, vas_group ); if( vas_user ) v_user_free( sudo_vas_ctx, vas_user ); - return(rval); + return rval; } diff --git a/visudo.c b/visudo.c index 912e1f7ac..f0324b331 100644 --- a/visudo.c +++ b/visudo.c @@ -350,17 +350,17 @@ edit_sudoers(sp, editor, args, lineno) if (stat(sp->tpath, &sb) < 0) { warningx("cannot stat temporary file (%s), %s unchanged", sp->tpath, sp->path); - return(FALSE); + return FALSE; } if (sb.st_size == 0 && orig_size != 0) { warningx("zero length temporary file (%s), %s unchanged", sp->tpath, sp->path); sp->modified = TRUE; - return(FALSE); + return FALSE; } } else { warningx("editor (%s) failed, %s unchanged", editor, sp->path); - return(FALSE); + return FALSE; } /* Set modified bit if use changed the file. */ @@ -384,7 +384,7 @@ edit_sudoers(sp, editor, args, lineno) else warningx("%s unchanged", sp->tpath); - return(TRUE); + return TRUE; } /* @@ -465,7 +465,7 @@ reparse_sudoers(editor, args, strict, quiet) } } while (parse_error); - return(TRUE); + return TRUE; } /* @@ -503,12 +503,12 @@ install_sudoers(sp, oldperms) if (chown(sp->tpath, SUDOERS_UID, SUDOERS_GID) != 0) { warning("unable to set (uid, gid) of %s to (%d, %d)", sp->tpath, SUDOERS_UID, SUDOERS_GID); - return(FALSE); + return FALSE; } if (chmod(sp->tpath, SUDOERS_MODE) != 0) { warning("unable to change mode of %s to 0%o", sp->tpath, SUDOERS_MODE); - return(FALSE); + return FALSE; } } @@ -542,17 +542,17 @@ install_sudoers(sp, oldperms) (void) unlink(sp->tpath); efree(sp->tpath); sp->tpath = NULL; - return(FALSE); + return FALSE; } efree(sp->tpath); sp->tpath = NULL; } else { warning("error renaming %s, %s unchanged", sp->tpath, sp->path); (void) unlink(sp->tpath); - return(FALSE); + return FALSE; } } - return(TRUE); + return TRUE; } /* STUB */ @@ -573,7 +573,7 @@ init_envtables() int user_is_exempt() { - return(FALSE); + return FALSE; } /* STUB */ @@ -594,7 +594,7 @@ char * sudo_getepw(pw) const struct passwd *pw; { - return (pw->pw_passwd); + return pw->pw_passwd; } /* @@ -619,7 +619,7 @@ whatnow() case 'e': case 'x': case 'Q': - return(choice); + return choice; default: (void) puts("Options are:"); (void) puts(" (e)dit sudoers file again"); @@ -681,8 +681,8 @@ run_command(path, argv) } while (rv == -1 && errno == EINTR); if (rv == -1 || !WIFEXITED(status)) - return(-1); - return(WEXITSTATUS(status)); + return -1; + return WEXITSTATUS(status); } static int @@ -748,7 +748,7 @@ check_syntax(sudoers_path, quiet, strict) } } - return(error); + return error; } /* @@ -781,7 +781,7 @@ open_sudoers(path, doedit, keepopen) if (entry->fd == -1) { warning("%s", entry->path); efree(entry); - return(NULL); + return NULL; } if (!lock_file(entry->fd, SUDO_TLOCK)) errorx(1, "%s busy, try again later", entry->path); @@ -801,7 +801,7 @@ open_sudoers(path, doedit, keepopen) } if (keepopen != NULL) *keepopen = TRUE; - return(fp); + return fp; } static char * @@ -902,7 +902,7 @@ get_editor(args) errorx(1, "no editor found (editor path = %s)", def_editor); } *args = EditorArgs; - return(Editor); + return Editor; } /* @@ -922,7 +922,7 @@ get_args(cmnd) while (*args && isblank((unsigned char) *args)) args++; } - return(*args ? args : NULL); + return *args ? args : NULL; } /* @@ -977,7 +977,7 @@ alias_remove_recursive(name, type, strict, quiet) a = alias_remove(name, type); if (a) rbinsert(alias_freelist, a); - return(error); + return error; } /* @@ -1100,7 +1100,7 @@ check_aliases(strict, quiet) if (!no_aliases() && !quiet) alias_apply(print_unused, strict ? "Error" : "Warning"); - return (strict ? error : 0); + return strict ? error : 0; } static void @@ -1147,7 +1147,7 @@ print_unused(v1, v2) a->type == HOSTALIAS ? "Host" : a->type == CMNDALIAS ? "Cmnd" : a->type == USERALIAS ? "User" : a->type == RUNASALIAS ? "Runas" : "Unknown", a->name); - return(0); + return 0; } /*