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/providers/ldap/sdap_reinit.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/providers/ldap/sdap_reinit.c')
-rw-r--r-- | src/providers/ldap/sdap_reinit.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/providers/ldap/sdap_reinit.c b/src/providers/ldap/sdap_reinit.c index 5c909379d..265453fdf 100644 --- a/src/providers/ldap/sdap_reinit.c +++ b/src/providers/ldap/sdap_reinit.c @@ -74,15 +74,15 @@ struct tevent_req* sdap_reinit_cleanup_send(TALLOC_CTX *mem_ctx, ret = sdap_reinit_clear_usn(state->sysdb, state->domain); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to clear USN attributes [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to clear USN attributes [%d]: %s\n", + ret, strerror(ret)); goto immediately; } subreq = sdap_dom_enum_send(id_ctx, be_ctx->ev, id_ctx, id_ctx->opts->sdom, id_ctx->conn); if (subreq == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to issue enumeration request\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to issue enumeration request\n"); ret = ENOMEM; goto immediately; } @@ -114,8 +114,8 @@ static void sdap_delete_msgs_usn(struct sysdb_ctx *sysdb, for (i = 0; i < msgs_num; i++) { ret = sysdb_set_entry_attr(sysdb, msgs[i]->dn, &usn_el, SYSDB_MOD_DEL); if (ret) { - DEBUG(SSSDBG_TRACE_FUNC, ("Failed to clean USN on entry: [%s]\n", - ldb_dn_get_linearized(msgs[i]->dn))); + DEBUG(SSSDBG_TRACE_FUNC, "Failed to clean USN on entry: [%s]\n", + ldb_dn_get_linearized(msgs[i]->dn)); } } } @@ -133,7 +133,7 @@ static errno_t sdap_reinit_clear_usn(struct sysdb_ctx *sysdb, tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_new() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_new() failed\n"); return ENOMEM; } @@ -166,7 +166,7 @@ static errno_t sdap_reinit_clear_usn(struct sysdb_ctx *sysdb, ret = sysdb_search_services(tmp_ctx, domain, "", attrs, &msgs_num, &msgs); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Cannot search services [%d]: %s\n", ret, strerror(ret))); + "Cannot search services [%d]: %s\n", ret, strerror(ret)); goto done; } @@ -178,14 +178,14 @@ static errno_t sdap_reinit_clear_usn(struct sysdb_ctx *sysdb, if (ret == EOK) { in_transaction = false; } else { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not commit transaction\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not commit transaction\n"); } done: if (in_transaction) { sret = sysdb_transaction_cancel(sysdb); if (sret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not cancel transaction\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not cancel transaction\n"); } } @@ -206,8 +206,8 @@ static void sdap_reinit_cleanup_done(struct tevent_req *subreq) ret = sdap_dom_enum_recv(subreq); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Domain enumeration failed [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Domain enumeration failed [%d]: %s\n", + ret, strerror(ret)); goto fail; } @@ -218,8 +218,8 @@ static void sdap_reinit_cleanup_done(struct tevent_req *subreq) */ ret = sysdb_set_enumerated(state->domain, true); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not mark domain as having " - "enumerated.\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not mark domain as having " + "enumerated.\n"); /* This error is non-fatal, so continue */ } @@ -245,8 +245,8 @@ static void sdap_delete_msgs_dn(struct sysdb_ctx *sysdb, for (i = 0; i < msgs_num; i++) { ret = sysdb_delete_entry(sysdb, msgs[i]->dn, true); if (ret) { - DEBUG(SSSDBG_TRACE_FUNC, ("Failed to delete entry: [%s]\n", - ldb_dn_get_linearized(msgs[i]->dn))); + DEBUG(SSSDBG_TRACE_FUNC, "Failed to delete entry: [%s]\n", + ldb_dn_get_linearized(msgs[i]->dn)); } } } @@ -264,7 +264,7 @@ static errno_t sdap_reinit_delete_records(struct sss_domain_info *domain) tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_new() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_new() failed\n"); return ENOMEM; } @@ -305,14 +305,14 @@ static errno_t sdap_reinit_delete_records(struct sss_domain_info *domain) if (ret == EOK) { in_transaction = false; } else { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not commit transaction\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not commit transaction\n"); } done: if (in_transaction) { sret = sysdb_transaction_cancel(sysdb); if (sret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not cancel transaction\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not cancel transaction\n"); } } |