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>

1 files changed, 12 insertions, 12 deletions

diff --git a/src/providers/ldap/sdap_autofs.c b/src/providers/ldap/sdap_autofs.c
index 3bee9a67f..5432a6f37 100644
--- a/src/providers/ldap/sdap_autofs.c
+++ b/src/providers/ldap/sdap_autofs.c
@@ -55,7 +55,7 @@ int sdap_autofs_init(struct be_ctx *be_ctx,
 {
     int ret;
 
-    DEBUG(SSSDBG_TRACE_INTERNAL, ("Initializing autofs LDAP back end\n"));
+    DEBUG(SSSDBG_TRACE_INTERNAL, "Initializing autofs LDAP back end\n");
 
     *ops = &sdap_autofs_ops;
     *pvt_data = id_ctx;
@@ -86,7 +86,7 @@ void sdap_autofs_handler(struct be_req *be_req)
     const char *master_map;
     int ret = EOK;
 
-    DEBUG(SSSDBG_TRACE_INTERNAL, ("sdap autofs handler called\n"));
+    DEBUG(SSSDBG_TRACE_INTERNAL, "sdap autofs handler called\n");
 
     id_ctx = talloc_get_type(be_ctx->bet_info[BET_AUTOFS].pvt_bet_data,
                              struct sdap_id_ctx);
@@ -97,24 +97,24 @@ void sdap_autofs_handler(struct be_req *be_req)
 
     autofs_req = talloc_get_type(be_req_get_data(be_req), struct be_autofs_req);
 
-    DEBUG(SSSDBG_FUNC_DATA, ("Requested refresh for: %s\n",
-          autofs_req->mapname ? autofs_req->mapname : "<ALL>\n"));
+    DEBUG(SSSDBG_FUNC_DATA, "Requested refresh for: %s\n",
+          autofs_req->mapname ? autofs_req->mapname : "<ALL>\n");
 
     if (autofs_req->mapname != NULL) {
         master_map = dp_opt_get_string(id_ctx->opts->basic,
                                        SDAP_AUTOFS_MAP_MASTER_NAME);
         if (strcmp(master_map, autofs_req->mapname) == 0) {
             autofs_req->invalidate = true;
-            DEBUG(SSSDBG_FUNC_DATA, ("Refresh of automount master map triggered: %s\n",
-                  autofs_req->mapname));
+            DEBUG(SSSDBG_FUNC_DATA, "Refresh of automount master map triggered: %s\n",
+                  autofs_req->mapname);
         }
     }
 
     if (autofs_req->invalidate) {
         ret = sysdb_invalidate_autofs_maps(id_ctx->be->domain);
         if (ret != EOK) {
-            DEBUG(SSSDBG_MINOR_FAILURE, ("Could not invalidate autofs maps, "
-                  "backend might return stale entries\n"));
+            DEBUG(SSSDBG_MINOR_FAILURE, "Could not invalidate autofs maps, "
+                  "backend might return stale entries\n");
         }
     }
 
@@ -167,7 +167,7 @@ sdap_autofs_get_map_send(TALLOC_CTX *mem_ctx,
 
     state->op = sdap_id_op_create(state, state->ctx->conn->conn_cache);
     if (!state->op) {
-        DEBUG(SSSDBG_OP_FAILURE, ("sdap_id_op_create failed\n"));
+        DEBUG(SSSDBG_OP_FAILURE, "sdap_id_op_create failed\n");
         ret = ENOMEM;
         goto fail;
     }
@@ -230,7 +230,7 @@ sdap_autofs_get_map_connect_done(struct tevent_req *subreq)
                                             state->map_name);
     if (!subreq) {
         DEBUG(SSSDBG_CRIT_FAILURE,
-              ("sdap_autofs_setautomntent_send failed\n"));
+              "sdap_autofs_setautomntent_send failed\n");
         tevent_req_error(req, ENOMEM);
         return;
     }
@@ -272,8 +272,8 @@ sdap_autofs_get_map_done(struct tevent_req *subreq)
         ret = sysdb_delete_autofsmap(state->ctx->be->domain, state->map_name);
         if (ret != EOK && ret != ENOENT) {
             DEBUG(SSSDBG_OP_FAILURE,
-                ("Cannot delete autofs map %s [%d]: %s\n",
-                 state->map_name, ret, strerror(ret)));
+                "Cannot delete autofs map %s [%d]: %s\n",
+                 state->map_name, ret, strerror(ret));
             tevent_req_error(req, ret);
             return;
         }