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

diff --git a/src/providers/ad/ad_domain_info.c b/src/providers/ad/ad_domain_info.c
index e8f90cc78..95944840c 100644
--- a/src/providers/ad/ad_domain_info.c
+++ b/src/providers/ad/ad_domain_info.c
@@ -57,15 +57,15 @@ netlogon_get_domain_info(TALLOC_CTX *mem_ctx,
 
     ret = sysdb_attrs_get_el(reply, AD_AT_NETLOGON, &el);
     if (ret != EOK) {
-        DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_get_el() failed\n"));
+        DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_get_el() failed\n");
         return ret;
     }
 
     if (el->num_values == 0) {
-        DEBUG(SSSDBG_OP_FAILURE, ("netlogon has no value\n"));
+        DEBUG(SSSDBG_OP_FAILURE, "netlogon has no value\n");
         return ENOENT;
     } else if (el->num_values > 1) {
-        DEBUG(SSSDBG_OP_FAILURE, ("More than one netlogon value?\n"));
+        DEBUG(SSSDBG_OP_FAILURE, "More than one netlogon value?\n");
         return EIO;
     }
 
@@ -74,22 +74,22 @@ netlogon_get_domain_info(TALLOC_CTX *mem_ctx,
 
     ndr_pull = ndr_pull_init_blob(&blob, mem_ctx);
     if (ndr_pull == NULL) {
-        DEBUG(SSSDBG_OP_FAILURE, ("ndr_pull_init_blob() failed.\n"));
+        DEBUG(SSSDBG_OP_FAILURE, "ndr_pull_init_blob() failed.\n");
         return ENOMEM;
     }
 
     ndr_err = ndr_pull_netlogon_samlogon_response(ndr_pull, NDR_SCALARS,
                                                   &response);
     if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-        DEBUG(SSSDBG_OP_FAILURE, ("ndr_pull_netlogon_samlogon_response() "
-                                  "failed [%d]\n", ndr_err));
+        DEBUG(SSSDBG_OP_FAILURE, "ndr_pull_netlogon_samlogon_response() "
+                                  "failed [%d]\n", ndr_err);
         ret = EBADMSG;
         goto done;
     }
 
     if (!(response.ntver & NETLOGON_NT_VERSION_5EX)) {
-        DEBUG(SSSDBG_OP_FAILURE, ("Wrong version returned [%x]\n",
-                                  response.ntver));
+        DEBUG(SSSDBG_OP_FAILURE, "Wrong version returned [%x]\n",
+                                  response.ntver);
         ret = EBADMSG;
         goto done;
     }
@@ -100,14 +100,14 @@ netlogon_get_domain_info(TALLOC_CTX *mem_ctx,
         flat_name = response.data.nt5_ex.domain_name;
     } else {
         DEBUG(SSSDBG_MINOR_FAILURE,
-              ("No netlogon domain name data available\n"));
+              "No netlogon domain name data available\n");
         ret = ENOENT;
         goto done;
     }
 
     *_flat_name = talloc_strdup(mem_ctx, flat_name);
     if (*_flat_name == NULL) {
-        DEBUG(SSSDBG_OP_FAILURE, ("talloc_strdup failed.\n"));
+        DEBUG(SSSDBG_OP_FAILURE, "talloc_strdup failed.\n");
         ret = ENOMEM;
         goto done;
     }
@@ -117,14 +117,14 @@ netlogon_get_domain_info(TALLOC_CTX *mem_ctx,
         *response.data.nt5_ex.forest != '\0') {
         forest = response.data.nt5_ex.forest;
     } else {
-        DEBUG(SSSDBG_MINOR_FAILURE, ("No netlogon forest data available\n"));
+        DEBUG(SSSDBG_MINOR_FAILURE, "No netlogon forest data available\n");
         ret = ENOENT;
         goto done;
     }
 
     *_forest = talloc_strdup(mem_ctx, forest);
     if (*_forest == NULL) {
-        DEBUG(SSSDBG_OP_FAILURE, ("talloc_strdup failed.\n"));
+        DEBUG(SSSDBG_OP_FAILURE, "talloc_strdup failed.\n");
         ret = ENOMEM;
         goto done;
     }
@@ -217,7 +217,7 @@ ad_master_domain_next(struct tevent_req *req)
                                                   SDAP_SEARCH_TIMEOUT),
                                    false);
     if (subreq == NULL) {
-        DEBUG(SSSDBG_OP_FAILURE, ("sdap_get_generic_send failed.\n"));
+        DEBUG(SSSDBG_OP_FAILURE, "sdap_get_generic_send failed.\n");
         return ENOMEM;
     }
     tevent_req_set_callback(subreq, ad_master_domain_next_done, req);
@@ -246,7 +246,7 @@ ad_master_domain_next_done(struct tevent_req *subreq)
     ret = sdap_get_generic_recv(subreq, state, &reply_count, &reply);
     talloc_zfree(subreq);
     if (ret != EOK) {
-        DEBUG(SSSDBG_OP_FAILURE, ("sdap_get_generic_send request failed.\n"));
+        DEBUG(SSSDBG_OP_FAILURE, "sdap_get_generic_send request failed.\n");
         goto done;
     }
 
@@ -266,7 +266,7 @@ ad_master_domain_next_done(struct tevent_req *subreq)
     } else if (reply_count == 1) {
         ret = sysdb_attrs_get_el(reply[0], AD_AT_OBJECT_SID, &el);
         if (ret != EOK || el->num_values != 1) {
-            DEBUG(SSSDBG_OP_FAILURE, ("sdap_attrs_get_el failed.\n"));
+            DEBUG(SSSDBG_OP_FAILURE, "sdap_attrs_get_el failed.\n");
             goto done;
         }
 
@@ -276,7 +276,7 @@ ad_master_domain_next_done(struct tevent_req *subreq)
                                        &sid_str);
         if (err != IDMAP_SUCCESS) {
             DEBUG(SSSDBG_MINOR_FAILURE,
-                  ("Could not convert SID: [%s].\n", idmap_error_string(err)));
+                  "Could not convert SID: [%s].\n", idmap_error_string(err));
             ret = EFAULT;
             goto done;
         }
@@ -284,17 +284,17 @@ ad_master_domain_next_done(struct tevent_req *subreq)
         state->sid = talloc_steal(state, sid_str);
     } else {
         DEBUG(SSSDBG_OP_FAILURE,
-              ("More than one result for domain SID found.\n"));
+              "More than one result for domain SID found.\n");
         ret = EINVAL;
         goto done;
     }
 
-    DEBUG(SSSDBG_TRACE_FUNC, ("Found SID [%s].\n", state->sid));
+    DEBUG(SSSDBG_TRACE_FUNC, "Found SID [%s].\n", state->sid);
 
     ntver = sss_ldap_encode_ndr_uint32(state, NETLOGON_NT_VERSION_5EX |
                                        NETLOGON_NT_VERSION_WITH_CLOSEST_SITE);
     if (ntver == NULL) {
-        DEBUG(SSSDBG_OP_FAILURE, ("sss_ldap_encode_ndr_uint32 failed.\n"));
+        DEBUG(SSSDBG_OP_FAILURE, "sss_ldap_encode_ndr_uint32 failed.\n");
         ret = ENOMEM;
         goto done;
     }
@@ -303,7 +303,7 @@ ad_master_domain_next_done(struct tevent_req *subreq)
                              AD_AT_DNS_DOMAIN, state->dom_name,
                              AD_AT_NT_VERSION, ntver);
     if (filter == NULL) {
-        DEBUG(SSSDBG_OP_FAILURE, ("talloc_asprintf failed.\n"));
+        DEBUG(SSSDBG_OP_FAILURE, "talloc_asprintf failed.\n");
         ret = ENOMEM;
         goto done;
     }
@@ -316,7 +316,7 @@ ad_master_domain_next_done(struct tevent_req *subreq)
                                                   SDAP_SEARCH_TIMEOUT),
                                    false);
     if (subreq == NULL) {
-        DEBUG(SSSDBG_OP_FAILURE, ("sdap_get_generic_send failed.\n"));
+        DEBUG(SSSDBG_OP_FAILURE, "sdap_get_generic_send failed.\n");
         ret = ENOMEM;
         goto done;
     }
@@ -343,19 +343,19 @@ ad_master_domain_netlogon_done(struct tevent_req *subreq)
     ret = sdap_get_generic_recv(subreq, state, &reply_count, &reply);
     talloc_zfree(subreq);
     if (ret != EOK) {
-        DEBUG(SSSDBG_OP_FAILURE, ("sdap_get_generic_send request failed.\n"));
+        DEBUG(SSSDBG_OP_FAILURE, "sdap_get_generic_send request failed.\n");
         tevent_req_error(req, ret);
         return;
     }
 
     /* Failure to get the flat name is not fatal. Just quit. */
     if (reply_count == 0) {
-        DEBUG(SSSDBG_MINOR_FAILURE, ("No netlogon data available. Flat name " \
-                                     "might not be usable\n"));
+        DEBUG(SSSDBG_MINOR_FAILURE, "No netlogon data available. Flat name " \
+                                     "might not be usable\n");
         goto done;
     } else if (reply_count > 1) {
         DEBUG(SSSDBG_MINOR_FAILURE,
-                ("More than one netlogon info returned.\n"));
+                "More than one netlogon info returned.\n");
         goto done;
     }
 
@@ -365,12 +365,12 @@ ad_master_domain_netlogon_done(struct tevent_req *subreq)
                                    &state->forest);
     if (ret != EOK) {
         DEBUG(SSSDBG_MINOR_FAILURE,
-              ("Could not get the flat name or forest\n"));
+              "Could not get the flat name or forest\n");
         /* Not fatal. Just quit. */
         goto done;
     }
-    DEBUG(SSSDBG_TRACE_FUNC, ("Found flat name [%s].\n", state->flat));
-    DEBUG(SSSDBG_TRACE_FUNC, ("Found forest [%s].\n", state->forest));
+    DEBUG(SSSDBG_TRACE_FUNC, "Found flat name [%s].\n", state->flat);
+    DEBUG(SSSDBG_TRACE_FUNC, "Found forest [%s].\n", state->forest);
 
 done:
     tevent_req_done(req);