isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Be consistent with the naming of the variable used to store the

Browse Source 
function return value.  Previously, some code used "rval", some
used "ret".  This standardizes on "ret" and uses "rc" for temporary
return codes.
This commit is contained in:
Todd C. Miller
2016-09-08 16:38:08 -06:00
parent 33fb814e85
commit 3f022419ae
45 changed files with 565 additions and 564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/hooks.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012-2015 Todd C. Miller <Todd.Miller@courtesan.com>
* Copyright (c) 2012-2016 Todd C. Miller <Todd.Miller@courtesan.com>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -147,40 +147,40 @@ register_hook_internal(struct sudo_hook_list *head,
int
register_hook(struct sudo_hook *hook)
{
int rval;
int ret;
debug_decl(register_hook, SUDO_DEBUG_HOOKS)
if (SUDO_API_VERSION_GET_MAJOR(hook->hook_version) != SUDO_HOOK_VERSION_MAJOR) {
/* Major versions must match. */
errno = EINVAL;
rval = -1;
ret = -1;
} else {
switch (hook->hook_type) {
case SUDO_HOOK_GETENV:
rval = register_hook_internal(&sudo_hook_getenv_list,
ret = register_hook_internal(&sudo_hook_getenv_list,
hook->hook_fn, hook->closure);
break;
case SUDO_HOOK_PUTENV:
rval = register_hook_internal(&sudo_hook_putenv_list,
ret = register_hook_internal(&sudo_hook_putenv_list,
hook->hook_fn, hook->closure);
break;
case SUDO_HOOK_SETENV:
rval = register_hook_internal(&sudo_hook_setenv_list,
ret = register_hook_internal(&sudo_hook_setenv_list,
hook->hook_fn, hook->closure);
break;
case SUDO_HOOK_UNSETENV:
rval = register_hook_internal(&sudo_hook_unsetenv_list,
ret = register_hook_internal(&sudo_hook_unsetenv_list,
hook->hook_fn, hook->closure);
break;
default:
/* XXX - use define for unknown value */
errno = ENOTSUP;
rval = 1;
ret = 1;
break;
}
}
debug_return_int(rval);
debug_return_int(ret);
}
/* Hook deregistration internals. */
@@ -211,12 +211,12 @@ deregister_hook_internal(struct sudo_hook_list *head,
int
deregister_hook(struct sudo_hook *hook)
{
int rval = 0;
int ret = 0;
debug_decl(deregister_hook, SUDO_DEBUG_HOOKS)
if (SUDO_API_VERSION_GET_MAJOR(hook->hook_version) != SUDO_HOOK_VERSION_MAJOR) {
/* Major versions must match. */
rval = -1;
ret = -1;
} else {
switch (hook->hook_type) {
case SUDO_HOOK_GETENV:
@@ -237,10 +237,10 @@ deregister_hook(struct sudo_hook *hook)
break;
default:
/* XXX - use define for unknown value */
rval = 1;
ret = 1;
break;
}
}
debug_return_int(rval);
debug_return_int(ret);
}