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

Fix -Wshadow warnings.

Browse Source
This commit is contained in:
Todd C. Miller
2020-09-25 15:09:45 -06:00
parent 7eda22c729
commit 88dcdcd11d
24 changed files with 151 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/sudoers/locale.c
View File

@@ -76,19 +76,19 @@ sudoers_initlocale(const char *ulocale, const char *slocale)
/*
* Set locale to user or sudoers value.
* Returns true on success and false on failure,
* If prevlocale is non-NULL it will be filled in with the
* If prev_locale is non-NULL it will be filled in with the
* old SUDOERS_LOCALE_* value.
*/
bool
sudoers_setlocale(int newlocale, int *prevlocale)
sudoers_setlocale(int locale_type, int *prev_locale)
{
char *res = NULL;
debug_decl(sudoers_setlocale, SUDOERS_DEBUG_UTIL);
switch (newlocale) {
switch (locale_type) {
case SUDOERS_LOCALE_USER:
if (prevlocale)
*prevlocale = current_locale;
if (prev_locale)
*prev_locale = current_locale;
if (current_locale != SUDOERS_LOCALE_USER) {
current_locale = SUDOERS_LOCALE_USER;
sudo_debug_printf(SUDO_DEBUG_DEBUG,
@@ -105,8 +105,8 @@ sudoers_setlocale(int newlocale, int *prevlocale)
}
break;
case SUDOERS_LOCALE_SUDOERS:
if (prevlocale)
*prevlocale = current_locale;
if (prev_locale)
*prev_locale = current_locale;
if (current_locale != SUDOERS_LOCALE_SUDOERS) {
current_locale = SUDOERS_LOCALE_SUDOERS;
sudo_debug_printf(SUDO_DEBUG_DEBUG,