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

Set pp_ignore_define_body=false in uncrustify config.

Browse Source 
Need to work around a bug that produces closed brace errors,
see https://github.com/uncrustify/uncrustify/issues/2569
This commit is contained in:
Todd C. Miller
2020-11-23 10:47:47 -07:00
parent 7bbd7c8e05
commit bdf5530014
5 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
etc/uncrustify-small.cfg
View File

@@ -341,6 +341,3 @@ pp_space = force # ignore/add/remove/force
# Sets the number of spaces per level added with pp_space.
pp_space_count = 1 # unsigned number
# Whether to ignore the '#define' body while formatting.
pp_ignore_define_body = true # true/false

2
etc/uncrustify.cfg
View File

@@ -2917,7 +2917,7 @@ pp_if_indent_code = false # true/false
pp_define_at_level = false # true/false
# Whether to ignore the '#define' body while formatting.
pp_ignore_define_body = true # true/false
pp_ignore_define_body = false # true/false
# Whether to indent case statements between #if, #else, and #endif.
# Only applies to the indent of the preprocesser that the case statements

3
plugins/python/regress/testhelpers.h
View File

@@ -75,8 +75,9 @@ char ** create_str_array(size_t count, ...);
printf("FAILED: deitialization of testcase %s at %s:%d\n", #testcase, __FILE__, __LINE__); \
success = 0; \
} \
if (!success) \
if (!success) { \
errors++; \
} \
} while(false)
#define VERIFY_PRINT_MSG(fmt, actual_str, actual, expected_str, expected, expected_to_be_message) \

6
plugins/sudoers/env.c
View File

@@ -860,13 +860,15 @@ env_update_didvar(const char *ep, unsigned int *didvar)
}
#define CHECK_PUTENV(a, b, c) do { \
if (sudo_putenv((a), (b), (c)) == -1) \
if (sudo_putenv((a), (b), (c)) == -1) { \
goto bad; \
} \
} while (0)
#define CHECK_SETENV2(a, b, c, d) do { \
if (sudo_setenv2((a), (b), (c), (d)) == -1) \
if (sudo_setenv2((a), (b), (c), (d)) == -1) { \
goto bad; \
} \
} while (0)
/*

21
plugins/sudoers/sudo_ldap_conf.h
View File

@@ -21,39 +21,46 @@
/* Macros for checking strlcpy/strlcat/sudo_ldap_value_cat return value. */
#define CHECK_STRLCPY(d, s, l) do { \
if (strlcpy((d), (s), (l)) >= (l)) \
if (strlcpy((d), (s), (l)) >= (l)) { \
goto overflow; \
} \
} while (0)
#define CHECK_STRLCAT(d, s, l) do { \
if (strlcat((d), (s), (l)) >= (l)) \
if (strlcat((d), (s), (l)) >= (l)) { \
goto overflow; \
} \
} while (0)
#define CHECK_LDAP_VCAT(d, s, l) do { \
if (sudo_ldap_value_cat((d), (s), (l)) >= (l)) \
if (sudo_ldap_value_cat((d), (s), (l)) >= (l)) { \
goto overflow; \
} \
} while (0)
#if defined(__GNUC__) && __GNUC__ == 2
# define DPRINTF1(fmt...) do { \
sudo_debug_printf(SUDO_DEBUG_DIAG, fmt); \
if (ldap_conf.debug >= 1) \
if (ldap_conf.debug >= 1) { \
sudo_warnx_nodebug(fmt); \
} \
} while (0)
# define DPRINTF2(fmt...) do { \
sudo_debug_printf(SUDO_DEBUG_INFO, fmt); \
if (ldap_conf.debug >= 2) \
if (ldap_conf.debug >= 2) { \
sudo_warnx_nodebug(fmt); \
} \
} while (0)
#else
# define DPRINTF1(...) do { \
sudo_debug_printf(SUDO_DEBUG_DIAG, __VA_ARGS__); \
if (ldap_conf.debug >= 1) \
if (ldap_conf.debug >= 1) { \
sudo_warnx_nodebug(__VA_ARGS__); \
} \
} while (0)
# define DPRINTF2(...) do { \
sudo_debug_printf(SUDO_DEBUG_INFO, __VA_ARGS__); \
if (ldap_conf.debug >= 2) \
if (ldap_conf.debug >= 2) { \
sudo_warnx_nodebug(__VA_ARGS__); \
} \
} while (0)
#endif