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
(identical to commit a3c8390d19593b1e5277d95bfb4ab206d4785150):

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, 30 insertions, 30 deletions

diff --git a/src/providers/ldap/sdap_async_enum.c b/src/providers/ldap/sdap_async_enum.c
index 0431d03c3..2b860905e 100644
--- a/src/providers/ldap/sdap_async_enum.c
+++ b/src/providers/ldap/sdap_async_enum.c
@@ -108,7 +108,7 @@ sdap_dom_enum_ex_send(TALLOC_CTX *memctx,
 
     state->user_op = sdap_id_op_create(state, user_conn->conn_cache);
     if (state->user_op == NULL) {
-        DEBUG(SSSDBG_CRIT_FAILURE, ("sdap_id_op_create failed for users\n"));
+        DEBUG(SSSDBG_CRIT_FAILURE, "sdap_id_op_create failed for users\n");
         ret = EIO;
         goto fail;
     }
@@ -116,7 +116,7 @@ sdap_dom_enum_ex_send(TALLOC_CTX *memctx,
     ret = sdap_dom_enum_ex_retry(req, state->user_op,
                                  sdap_dom_enum_ex_get_users);
     if (ret != EOK) {
-        DEBUG(SSSDBG_OP_FAILURE, ("sdap_dom_enum_ex_retry failed\n"));
+        DEBUG(SSSDBG_OP_FAILURE, "sdap_dom_enum_ex_retry failed\n");
         goto fail;
     }
 
@@ -140,7 +140,7 @@ static errno_t sdap_dom_enum_ex_retry(struct tevent_req *req,
     subreq = sdap_id_op_connect_send(op, state, &ret);
     if (subreq == NULL) {
         DEBUG(SSSDBG_OP_FAILURE,
-              ("sdap_id_op_connect_send failed: %d\n", ret));
+              "sdap_id_op_connect_send failed: %d\n", ret);
         return ret;
     }
 
@@ -160,12 +160,12 @@ static bool sdap_dom_enum_ex_connected(struct tevent_req *subreq)
     if (ret != EOK) {
         if (dp_error == DP_ERR_OFFLINE) {
             DEBUG(SSSDBG_TRACE_FUNC,
-                  ("Backend is marked offline, retry later!\n"));
+                  "Backend is marked offline, retry later!\n");
             tevent_req_done(req);
         } else {
             DEBUG(SSSDBG_MINOR_FAILURE,
-                  ("Domain enumeration failed to connect to " \
-                   "LDAP server: (%d)[%s]\n", ret, strerror(ret)));
+                  "Domain enumeration failed to connect to " \
+                   "LDAP server: (%d)[%s]\n", ret, strerror(ret));
             tevent_req_error(req, ret);
         }
         return false;
@@ -249,13 +249,13 @@ static void sdap_dom_enum_ex_posix_check_done(struct tevent_req *subreq)
             }
             return;
         } else if (dp_error == DP_ERR_OFFLINE) {
-            DEBUG(SSSDBG_TRACE_FUNC, ("Backend is offline, retrying later\n"));
+            DEBUG(SSSDBG_TRACE_FUNC, "Backend is offline, retrying later\n");
             tevent_req_done(req);
             return;
         } else {
             /* Non-recoverable error */
             DEBUG(SSSDBG_OP_FAILURE,
-                ("POSIX check failed: %d: %s\n", ret, sss_strerror(ret)));
+                "POSIX check failed: %d: %s\n", ret, sss_strerror(ret));
             tevent_req_error(req, ret);
             return;
         }
@@ -317,20 +317,20 @@ static void sdap_dom_enum_ex_users_done(struct tevent_req *subreq)
         }
         return;
     } else if (dp_error == DP_ERR_OFFLINE) {
-        DEBUG(SSSDBG_TRACE_FUNC, ("Backend is offline, retrying later\n"));
+        DEBUG(SSSDBG_TRACE_FUNC, "Backend is offline, retrying later\n");
         tevent_req_done(req);
         return;
     } else if (ret != EOK && ret != ENOENT) {
         /* Non-recoverable error */
         DEBUG(SSSDBG_OP_FAILURE,
-              ("User enumeration failed: %d: %s\n", ret, sss_strerror(ret)));
+              "User enumeration failed: %d: %s\n", ret, sss_strerror(ret));
         tevent_req_error(req, ret);
         return;
     }
 
     state->group_op = sdap_id_op_create(state, state->group_conn->conn_cache);
     if (state->group_op == NULL) {
-        DEBUG(SSSDBG_CRIT_FAILURE, ("sdap_id_op_create failed for groups\n"));
+        DEBUG(SSSDBG_CRIT_FAILURE, "sdap_id_op_create failed for groups\n");
         tevent_req_error(req, EIO);
         return;
     }
@@ -388,13 +388,13 @@ static void sdap_dom_enum_ex_groups_done(struct tevent_req *subreq)
         }
         return;
     } else if (dp_error == DP_ERR_OFFLINE) {
-        DEBUG(SSSDBG_TRACE_FUNC, ("Backend is offline, retrying later\n"));
+        DEBUG(SSSDBG_TRACE_FUNC, "Backend is offline, retrying later\n");
         tevent_req_done(req);
         return;
     } else if (ret != EOK && ret != ENOENT) {
         /* Non-recoverable error */
         DEBUG(SSSDBG_OP_FAILURE,
-              ("Group enumeration failed: %d: %s\n", ret, sss_strerror(ret)));
+              "Group enumeration failed: %d: %s\n", ret, sss_strerror(ret));
         tevent_req_error(req, ret);
         return;
     }
@@ -402,7 +402,7 @@ static void sdap_dom_enum_ex_groups_done(struct tevent_req *subreq)
 
     state->svc_op = sdap_id_op_create(state, state->svc_conn->conn_cache);
     if (state->svc_op == NULL) {
-        DEBUG(SSSDBG_CRIT_FAILURE, ("sdap_id_op_create failed for svcs\n"));
+        DEBUG(SSSDBG_CRIT_FAILURE, "sdap_id_op_create failed for svcs\n");
         tevent_req_error(req, EIO);
         return;
     }
@@ -457,13 +457,13 @@ static void sdap_dom_enum_ex_svcs_done(struct tevent_req *subreq)
         }
         return;
     } else if (dp_error == DP_ERR_OFFLINE) {
-        DEBUG(SSSDBG_TRACE_FUNC, ("Backend is offline, retrying later\n"));
+        DEBUG(SSSDBG_TRACE_FUNC, "Backend is offline, retrying later\n");
         tevent_req_done(req);
         return;
     } else if (ret != EOK && ret != ENOENT) {
         /* Non-recoverable error */
         DEBUG(SSSDBG_OP_FAILURE,
-              ("Service enumeration failed: %d: %s\n", ret, sss_strerror(ret)));
+              "Service enumeration failed: %d: %s\n", ret, sss_strerror(ret));
         tevent_req_error(req, ret);
         return;
     }
@@ -477,7 +477,7 @@ static void sdap_dom_enum_ex_svcs_done(struct tevent_req *subreq)
                                state->sdom->dom, true);
     if (ret != EOK) {
         DEBUG(SSSDBG_MINOR_FAILURE,
-              ("Could not mark domain as having enumerated.\n"));
+              "Could not mark domain as having enumerated.\n");
         /* This error is non-fatal, so continue */
     }
 
@@ -487,7 +487,7 @@ static void sdap_dom_enum_ex_svcs_done(struct tevent_req *subreq)
             /* Not fatal, worst case we'll have stale entries that would be
              * removed on a subsequent online lookup
              */
-            DEBUG(SSSDBG_MINOR_FAILURE, ("Cleanup failed: %d\n", ret));
+            DEBUG(SSSDBG_MINOR_FAILURE, "Cleanup failed: %d\n", ret);
         }
     }
 
@@ -562,7 +562,7 @@ static struct tevent_req *enum_users_send(TALLOC_CTX *memctx,
                                   ctx->opts->user_map[SDAP_AT_USER_NAME].name);
     if (!state->filter) {
         DEBUG(SSSDBG_MINOR_FAILURE,
-              ("Failed to build base filter\n"));
+              "Failed to build base filter\n");
         ret = ENOMEM;
         goto fail;
     }
@@ -583,7 +583,7 @@ static struct tevent_req *enum_users_send(TALLOC_CTX *memctx,
     }
     if (!state->filter) {
         DEBUG(SSSDBG_MINOR_FAILURE,
-              ("Failed to build base filter\n"));
+              "Failed to build base filter\n");
         ret = ENOMEM;
         goto fail;
     }
@@ -602,7 +602,7 @@ static struct tevent_req *enum_users_send(TALLOC_CTX *memctx,
 
         if (!state->filter) {
             DEBUG(SSSDBG_MINOR_FAILURE,
-                  ("Failed to build base filter\n"));
+                  "Failed to build base filter\n");
             ret = ENOMEM;
             goto fail;
         }
@@ -611,7 +611,7 @@ static struct tevent_req *enum_users_send(TALLOC_CTX *memctx,
     /* Terminate the search filter */
     state->filter = talloc_asprintf_append_buffer(state->filter, ")");
     if (!state->filter) {
-        DEBUG(2, ("Failed to build base filter\n"));
+        DEBUG(2, "Failed to build base filter\n");
         ret = ENOMEM;
         goto fail;
     }
@@ -679,8 +679,8 @@ static void enum_users_done(struct tevent_req *subreq)
         }
     }
 
-    DEBUG(4, ("Users higher USN value: [%s]\n",
-              state->ctx->srv_opts->max_user_value));
+    DEBUG(4, "Users higher USN value: [%s]\n",
+              state->ctx->srv_opts->max_user_value);
 
     tevent_req_done(req);
 }
@@ -737,7 +737,7 @@ static struct tevent_req *enum_groups_send(TALLOC_CTX *memctx,
                                ctx->opts->group_map[SDAP_AT_GROUP_NAME].name);
     if (!state->filter) {
         DEBUG(SSSDBG_MINOR_FAILURE,
-              ("Failed to build base filter\n"));
+              "Failed to build base filter\n");
         ret = ENOMEM;
         goto fail;
     }
@@ -758,7 +758,7 @@ static struct tevent_req *enum_groups_send(TALLOC_CTX *memctx,
     }
     if (!state->filter) {
         DEBUG(SSSDBG_MINOR_FAILURE,
-              ("Failed to build base filter\n"));
+              "Failed to build base filter\n");
         ret = ENOMEM;
         goto fail;
     }
@@ -773,7 +773,7 @@ static struct tevent_req *enum_groups_send(TALLOC_CTX *memctx,
                 ctx->srv_opts->max_group_value);
         if (!state->filter) {
             DEBUG(SSSDBG_MINOR_FAILURE,
-                  ("Failed to build base filter\n"));
+                  "Failed to build base filter\n");
             ret = ENOMEM;
             goto fail;
         }
@@ -783,7 +783,7 @@ static struct tevent_req *enum_groups_send(TALLOC_CTX *memctx,
     state->filter = talloc_asprintf_append_buffer(state->filter, ")");
     if (!state->filter) {
         DEBUG(SSSDBG_MINOR_FAILURE,
-              ("Failed to build base filter\n"));
+              "Failed to build base filter\n");
         ret = ENOMEM;
         goto fail;
     }
@@ -848,8 +848,8 @@ static void enum_groups_done(struct tevent_req *subreq)
         }
     }
 
-    DEBUG(4, ("Groups higher USN value: [%s]\n",
-              state->ctx->srv_opts->max_group_value));
+    DEBUG(4, "Groups higher USN value: [%s]\n",
+              state->ctx->srv_opts->max_group_value);
 
     tevent_req_done(req);
 }