diff options
author | Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com> | 2014-02-12 10:12:04 -0500 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2014-02-12 22:30:55 +0100 |
commit | a3c8390d19593b1e5277d95bfb4ab206d4785150 (patch) | |
tree | 2eb4e5432f4f79a75589c03b1513b656879ebf9c /src/util/sss_ini.c | |
parent | cc026fd9ba386f2197e3217940d597dcad1a26fe (diff) | |
download | sssd-a3c8390d19593b1e5277d95bfb4ab206d4785150.tar.gz sssd-a3c8390d19593b1e5277d95bfb4ab206d4785150.tar.xz sssd-a3c8390d19593b1e5277d95bfb4ab206d4785150.zip |
Make DEBUG macro invocations variadic
Use a script to update DEBUG macro invocations to use it as a variadic
macro, supplying format string and its arguments directly, instead of
wrapping them in parens.
This script was used to update the code:
grep -rwl --include '*.[hc]' DEBUG . |
while read f; do
mv "$f"{,.orig}
perl -e \
'use strict;
use File::Slurp;
my $text=read_file(\*STDIN);
$text=~s#(\bDEBUG\s*\([^(]+)\((.*?)\)\s*\)\s*;#$1$2);#gs;
print $text;' < "$f.orig" > "$f"
rm "$f.orig"
done
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
Reviewed-by: Stephen Gallagher <sgallagh@redhat.com>
Reviewed-by: Simo Sorce <simo@redhat.com>
Diffstat (limited to 'src/util/sss_ini.c')
-rw-r--r-- | src/util/sss_ini.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/util/sss_ini.c b/src/util/sss_ini.c index 9f23500ab..ce0d06755 100644 --- a/src/util/sss_ini.c +++ b/src/util/sss_ini.c @@ -193,7 +193,7 @@ void sss_ini_config_print_errors(char **error_list) } while (error_list[count]) { - DEBUG(SSSDBG_CRIT_FAILURE, ("%s\n", error_list[count])); + DEBUG(SSSDBG_CRIT_FAILURE, "%s\n", error_list[count]); count++; } #endif @@ -215,7 +215,7 @@ int sss_ini_get_config(struct sss_ini_initdata *init_data, ret = ini_config_create(&(init_data->sssd_config)); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Failed to create config object. Error %d.\n", ret)); + "Failed to create config object. Error %d.\n", ret); return ret; } @@ -228,12 +228,12 @@ int sss_ini_get_config(struct sss_ini_initdata *init_data, if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Failed to parse configuration. Error %d.\n", ret)); + "Failed to parse configuration. Error %d.\n", ret); if (ini_config_error_count(init_data->sssd_config)) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Errors detected while parsing: %s\n", - ini_config_get_filename(init_data->file))); + "Errors detected while parsing: %s\n", + ini_config_get_filename(init_data->file)); ini_config_get_errors(init_data->sssd_config, &init_data->error_list); @@ -259,8 +259,8 @@ int sss_ini_get_config(struct sss_ini_initdata *init_data, if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Parse error reading configuration file [%s]\n", - config_file)); + "Parse error reading configuration file [%s]\n", + config_file); print_file_parsing_errors(stderr, init_data->error_list); @@ -382,7 +382,7 @@ int sss_confdb_create_ldif(TALLOC_CTX *mem_ctx, for (i = 0; i < section_count; i++) { const char *rdn = NULL; DEBUG(SSSDBG_TRACE_FUNC, - ("Processing config section [%s]\n", sections[i])); + "Processing config section [%s]\n", sections[i]); ret = parse_section(tmp_ctx, sections[i], &sec_dn, &rdn); if (ret != EOK) { goto error; @@ -409,7 +409,7 @@ int sss_confdb_create_ldif(TALLOC_CTX *mem_ctx, for (j = 0; j < attr_count; j++) { DEBUG(SSSDBG_TRACE_FUNC, - ("Processing attribute [%s]\n", attrs[j])); + "Processing attribute [%s]\n", attrs[j]); ret = sss_ini_get_config_obj(sections[i], attrs[j], init_data->sssd_config, INI_GET_FIRST_VALUE, &obj); @@ -419,14 +419,14 @@ int sss_confdb_create_ldif(TALLOC_CTX *mem_ctx, if (ret != EOK) goto error; if (value && value[0] == '\0') { DEBUG(SSSDBG_CRIT_FAILURE, - ("Attribute '%s' has empty value, ignoring\n", - attrs[j])); + "Attribute '%s' has empty value, ignoring\n", + attrs[j]); continue; } ldif_attr = talloc_asprintf(tmp_ctx, "%s: %s\n", attrs[j], value); - DEBUG(SSSDBG_TRACE_ALL, ("%s", ldif_attr)); + DEBUG(SSSDBG_TRACE_ALL, "%s", ldif_attr); attr_len = strlen(ldif_attr); @@ -456,7 +456,7 @@ int sss_confdb_create_ldif(TALLOC_CTX *mem_ctx, dn[dn_size-1] = '\n'; dn[dn_size] = '\0'; - DEBUG(SSSDBG_TRACE_ALL, ("Section dn\n%s", dn)); + DEBUG(SSSDBG_TRACE_ALL, "Section dn\n%s", dn); tmp_ldif = talloc_realloc(mem_ctx, ldif, char, ldif_len+dn_size+1); |