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

diff --git a/src/responder/sudo/sudosrv_get_sudorules.c b/src/responder/sudo/sudosrv_get_sudorules.c
index fa461b4f0..9d8ef5d2a 100644
--- a/src/responder/sudo/sudosrv_get_sudorules.c
+++ b/src/responder/sudo/sudosrv_get_sudorules.c
@@ -39,11 +39,11 @@ errno_t sudosrv_get_sudorules(struct sudo_dom_ctx *dctx)
     ret = sudosrv_get_user(dctx);
     if (ret == EAGAIN) {
         DEBUG(SSSDBG_TRACE_INTERNAL,
-              ("Looking up the user info from Data Provider\n"));
+              "Looking up the user info from Data Provider\n");
         return EAGAIN;
     } else if (ret != EOK) {
         DEBUG(SSSDBG_OP_FAILURE,
-              ("Error looking up user information [%d]: %s\n", ret, strerror(ret)));
+              "Error looking up user information [%d]: %s\n", ret, strerror(ret));
         return ret;
     }
 
@@ -51,11 +51,11 @@ errno_t sudosrv_get_sudorules(struct sudo_dom_ctx *dctx)
     ret = sudosrv_get_rules(dctx->cmd_ctx);
     if (ret == EAGAIN) {
         DEBUG(SSSDBG_TRACE_INTERNAL,
-              ("Looking up the sudo rules from Data Provider\n"));
+              "Looking up the sudo rules from Data Provider\n");
         return EAGAIN;
     } else if (ret != EOK) {
         DEBUG(SSSDBG_OP_FAILURE,
-              ("Error looking up sudo rules [%d]: %s\n", ret, strerror(ret)));
+              "Error looking up sudo rules [%d]: %s\n", ret, strerror(ret));
         return ret;
     }
 
@@ -83,7 +83,7 @@ static errno_t sudosrv_get_user(struct sudo_dom_ctx *dctx)
 
     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;
     }
 
@@ -103,25 +103,25 @@ static errno_t sudosrv_get_user(struct sudo_dom_ctx *dctx)
         name = sss_get_cased_name(tmp_ctx, cmd_ctx->username,
                                   dom->case_sensitive);
         if (name == NULL) {
-            DEBUG(SSSDBG_CRIT_FAILURE, ("Out of memory\n"));
+            DEBUG(SSSDBG_CRIT_FAILURE, "Out of memory\n");
             ret = ENOMEM;
             goto done;
         }
 
-        DEBUG(SSSDBG_FUNC_DATA, ("Requesting info about [%s@%s]\n",
-              name, dom->name));
+        DEBUG(SSSDBG_FUNC_DATA, "Requesting info about [%s@%s]\n",
+              name, dom->name);
 
         ret = sysdb_getpwnam(dctx, dctx->domain, name, &user);
         if (ret != EOK) {
             DEBUG(SSSDBG_OP_FAILURE,
-                  ("Failed to make request to our cache!\n"));
+                  "Failed to make request to our cache!\n");
             ret = EIO;
             goto done;
         }
 
         if (user->count > 1) {
             DEBUG(SSSDBG_CRIT_FAILURE,
-                  ("getpwnam call returned more than one result !?!\n"));
+                  "getpwnam call returned more than one result !?!\n");
             ret = EIO;
             goto done;
         }
@@ -134,7 +134,7 @@ static errno_t sudosrv_get_user(struct sudo_dom_ctx *dctx)
                 if (dom) continue;
             }
 
-            DEBUG(SSSDBG_MINOR_FAILURE, ("No results for getpwnam call\n"));
+            DEBUG(SSSDBG_MINOR_FAILURE, "No results for getpwnam call\n");
             ret = ENOENT;
             goto done;
         }
@@ -154,7 +154,7 @@ static errno_t sudosrv_get_user(struct sudo_dom_ctx *dctx)
                                             cmd_ctx->username, 0, NULL);
             if (!dpreq) {
                 DEBUG(SSSDBG_CRIT_FAILURE,
-                      ("Out of memory sending data provider request\n"));
+                      "Out of memory sending data provider request\n");
                 ret = ENOMEM;
                 goto done;
             }
@@ -188,7 +188,7 @@ static errno_t sudosrv_get_user(struct sudo_dom_ctx *dctx)
                 if (dom) continue;
             }
 
-            DEBUG(SSSDBG_MINOR_FAILURE, ("UID does not match\n"));
+            DEBUG(SSSDBG_MINOR_FAILURE, "UID does not match\n");
             ret = ENOENT;
             goto done;
         }
@@ -197,7 +197,7 @@ static errno_t sudosrv_get_user(struct sudo_dom_ctx *dctx)
         original_name = ldb_msg_find_attr_as_string(user->msgs[0],
                                                     SYSDB_NAME, NULL);
         if (original_name == NULL) {
-            DEBUG(SSSDBG_CRIT_FAILURE, ("A user with no name?\n"));
+            DEBUG(SSSDBG_CRIT_FAILURE, "A user with no name?\n");
             ret = EFAULT;
             goto done;
         }
@@ -205,7 +205,7 @@ static errno_t sudosrv_get_user(struct sudo_dom_ctx *dctx)
         cmd_ctx->cased_username = talloc_move(cmd_ctx, &name);
         cmd_ctx->orig_username = talloc_strdup(cmd_ctx, original_name);
         if (cmd_ctx->orig_username == NULL) {
-            DEBUG(SSSDBG_CRIT_FAILURE, ("Out of memory\n"));
+            DEBUG(SSSDBG_CRIT_FAILURE, "Out of memory\n");
             ret = ENOMEM;
             goto done;
         }
@@ -213,8 +213,8 @@ static errno_t sudosrv_get_user(struct sudo_dom_ctx *dctx)
         /* and set domain */
         cmd_ctx->domain = dom;
 
-        DEBUG(SSSDBG_TRACE_FUNC, ("Returning info for user [%s@%s]\n",
-              cmd_ctx->username, dctx->domain->name));
+        DEBUG(SSSDBG_TRACE_FUNC, "Returning info for user [%s@%s]\n",
+              cmd_ctx->username, dctx->domain->name);
         ret = EOK;
         goto done;
     }
@@ -241,7 +241,7 @@ static void sudosrv_dp_send_acct_req_done(struct tevent_req *req)
     talloc_zfree(req);
     if (ret != EOK) {
         DEBUG(SSSDBG_CRIT_FAILURE,
-              ("Fatal error, killing connection!\n"));
+              "Fatal error, killing connection!\n");
         talloc_free(cb_ctx->cctx);
         return;
     }
@@ -257,33 +257,33 @@ static void sudosrv_check_user_dp_callback(uint16_t err_maj, uint32_t err_min,
 
     if (err_maj) {
         DEBUG(SSSDBG_CRIT_FAILURE,
-             ("Unable to get information from Data Provider\n"
+             "Unable to get information from Data Provider\n"
               "Error: %u, %u, %s\n",
-              (unsigned int)err_maj, (unsigned int)err_min, err_msg));
+              (unsigned int)err_maj, (unsigned int)err_min, err_msg);
     }
 
     DEBUG(SSSDBG_TRACE_INTERNAL,
-          ("Data Provider returned, check the cache again\n"));
+          "Data Provider returned, check the cache again\n");
     dctx->check_provider = false;
     ret = sudosrv_get_user(dctx);
     if (ret == EAGAIN) {
         goto done;
     } else if (ret != EOK) {
         DEBUG(SSSDBG_OP_FAILURE,
-              ("Could not look up the user [%d]: %s\n",
-              ret, strerror(ret)));
+              "Could not look up the user [%d]: %s\n",
+              ret, strerror(ret));
         sudosrv_cmd_done(dctx->cmd_ctx, ret);
         return;
     }
 
-    DEBUG(SSSDBG_TRACE_INTERNAL, ("Looking up sudo rules..\n"));
+    DEBUG(SSSDBG_TRACE_INTERNAL, "Looking up sudo rules..\n");
     ret = sudosrv_get_rules(dctx->cmd_ctx);
     if (ret == EAGAIN) {
         goto done;
     } else if (ret != EOK) {
         DEBUG(SSSDBG_OP_FAILURE,
-              ("Error getting sudo rules [%d]: %s\n",
-              ret, strerror(ret)));
+              "Error getting sudo rules [%d]: %s\n",
+              ret, strerror(ret));
         sudosrv_cmd_done(dctx->cmd_ctx, EIO);
         return;
     }
@@ -326,26 +326,26 @@ errno_t sudosrv_get_rules(struct sudo_cmd_ctx *cmd_ctx)
                             NULL };
 
     if (cmd_ctx->domain == NULL) {
-        DEBUG(SSSDBG_CRIT_FAILURE, ("Domain is not set!\n"));
+        DEBUG(SSSDBG_CRIT_FAILURE, "Domain is not set!\n");
         return EFAULT;
     }
 
     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;
     }
 
     switch (cmd_ctx->type) {
         case SSS_SUDO_DEFAULTS:
-            DEBUG(SSSDBG_TRACE_FUNC, ("Retrieving default options "
+            DEBUG(SSSDBG_TRACE_FUNC, "Retrieving default options "
                   "for [%s] from [%s]\n", cmd_ctx->orig_username,
-                  cmd_ctx->domain->name));
+                  cmd_ctx->domain->name);
             break;
         case SSS_SUDO_USER:
-            DEBUG(SSSDBG_TRACE_FUNC, ("Retrieving rules "
+            DEBUG(SSSDBG_TRACE_FUNC, "Retrieving rules "
                   "for [%s] from [%s]\n", cmd_ctx->orig_username,
-                  cmd_ctx->domain->name));
+                  cmd_ctx->domain->name);
             break;
     }
 
@@ -358,7 +358,7 @@ errno_t sudosrv_get_rules(struct sudo_cmd_ctx *cmd_ctx)
                                    cmd_ctx->orig_username, NULL, &groupnames);
     if (ret != EOK) {
         DEBUG(SSSDBG_CRIT_FAILURE,
-             ("Unable to retrieve user info [%d]: %s\n", ret, strerror(ret)));
+             "Unable to retrieve user info [%d]: %s\n", ret, strerror(ret));
         goto done;
     }
 
@@ -372,16 +372,16 @@ errno_t sudosrv_get_rules(struct sudo_cmd_ctx *cmd_ctx)
                                             cmd_ctx->uid, groupnames,
                                             &expired_rules, &expired_rules_num);
     if (ret != EOK) {
-        DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to retrieve expired sudo rules "
-                                    "[%d]: %s\n", ret, strerror(ret)));
+        DEBUG(SSSDBG_CRIT_FAILURE, "Unable to retrieve expired sudo rules "
+                                    "[%d]: %s\n", ret, strerror(ret));
         goto done;
     }
 
     cmd_ctx->expired_rules_num = expired_rules_num;
     if (expired_rules_num > 0) {
         /* refresh expired rules then continue */
-        DEBUG(SSSDBG_TRACE_INTERNAL, ("Refreshing %d expired rules\n",
-                                      expired_rules_num));
+        DEBUG(SSSDBG_TRACE_INTERNAL, "Refreshing %d expired rules\n",
+                                      expired_rules_num);
         dpreq = sss_dp_get_sudoers_send(tmp_ctx, cmd_ctx->cli_ctx->rctx,
                                         cmd_ctx->domain, false,
                                         SSS_DP_SUDO_REFRESH_RULES,
@@ -389,7 +389,7 @@ errno_t sudosrv_get_rules(struct sudo_cmd_ctx *cmd_ctx)
                                         expired_rules_num, expired_rules);
         if (dpreq == NULL) {
             DEBUG(SSSDBG_CRIT_FAILURE,
-                  ("Cannot issue DP request.\n"));
+                  "Cannot issue DP request.\n");
             ret = EIO;
             goto done;
         }
@@ -411,14 +411,14 @@ errno_t sudosrv_get_rules(struct sudo_cmd_ctx *cmd_ctx)
 
     } else {
         /* nothing is expired return what we have in the cache */
-        DEBUG(SSSDBG_TRACE_INTERNAL, ("About to get sudo rules from cache\n"));
+        DEBUG(SSSDBG_TRACE_INTERNAL, "About to get sudo rules from cache\n");
         ret = sudosrv_get_sudorules_from_cache(cmd_ctx, cmd_ctx,
                                                &cmd_ctx->rules,
                                                &cmd_ctx->num_rules);
         if (ret != EOK) {
             DEBUG(SSSDBG_OP_FAILURE,
-                  ("Failed to make a request to our cache [%d]: %s\n",
-                   ret, strerror(ret)));
+                  "Failed to make a request to our cache [%d]: %s\n",
+                   ret, strerror(ret));
             goto done;
         }
     }
@@ -455,7 +455,7 @@ sudosrv_dp_req_done(struct tevent_req *req)
                                   &err_msg);
     talloc_free(req);
     if (ret != EOK) {
-        DEBUG(SSSDBG_CRIT_FAILURE, ("Fatal error, killing connection!\n"));
+        DEBUG(SSSDBG_CRIT_FAILURE, "Fatal error, killing connection!\n");
         talloc_free(cli_ctx);
         return;
     }
@@ -466,7 +466,7 @@ sudosrv_dp_req_done(struct tevent_req *req)
 static void
 sudosrv_dp_oob_req_done(struct tevent_req *req)
 {
-    DEBUG(SSSDBG_TRACE_FUNC, ("Out of band refresh finished\n"));
+    DEBUG(SSSDBG_TRACE_FUNC, "Out of band refresh finished\n");
     talloc_free(req);
 }
 
@@ -480,19 +480,19 @@ sudosrv_get_sudorules_dp_callback(uint16_t err_maj, uint32_t err_min,
 
     if (err_maj) {
         DEBUG(SSSDBG_CRIT_FAILURE,
-              ("Unable to get information from Data Provider\n"
+              "Unable to get information from Data Provider\n"
                "Error: %u, %u, %s\n"
                "Will try to return what we have in cache\n",
-               (unsigned int)err_maj, (unsigned int)err_min, err_msg));
+               (unsigned int)err_maj, (unsigned int)err_min, err_msg);
     }
 
-    DEBUG(SSSDBG_TRACE_INTERNAL, ("About to get sudo rules from cache\n"));
+    DEBUG(SSSDBG_TRACE_INTERNAL, "About to get sudo rules from cache\n");
     ret = sudosrv_get_sudorules_from_cache(cmd_ctx, cmd_ctx, &cmd_ctx->rules,
                                            &cmd_ctx->num_rules);
     if (ret != EOK) {
         DEBUG(SSSDBG_OP_FAILURE,
-              ("Failed to make a request to our cache [%d]: %s\n",
-              ret, strerror(ret)));
+              "Failed to make a request to our cache [%d]: %s\n",
+              ret, strerror(ret));
         sudosrv_cmd_done(cmd_ctx, EIO);
         return;
     }
@@ -500,8 +500,8 @@ sudosrv_get_sudorules_dp_callback(uint16_t err_maj, uint32_t err_min,
     if (cmd_ctx->expired_rules_num > 0
         && err_min == ENOENT) {
         DEBUG(SSSDBG_TRACE_INTERNAL,
-              ("Some expired rules were removed from the server, "
-               "scheduling full refresh out of band\n"));
+              "Some expired rules were removed from the server, "
+               "scheduling full refresh out of band\n");
         dpreq = sss_dp_get_sudoers_send(cmd_ctx->cli_ctx->rctx,
                                         cmd_ctx->cli_ctx->rctx,
                                         cmd_ctx->domain, false,
@@ -510,7 +510,7 @@ sudosrv_get_sudorules_dp_callback(uint16_t err_maj, uint32_t err_min,
                                         0, NULL);
         if (dpreq == NULL) {
             DEBUG(SSSDBG_CRIT_FAILURE,
-                  ("Cannot issue DP request.\n"));
+                  "Cannot issue DP request.\n");
         } else {
             tevent_req_set_callback(dpreq, sudosrv_dp_oob_req_done, NULL);
         }
@@ -545,13 +545,13 @@ static errno_t sudosrv_get_sudorules_from_cache(TALLOC_CTX *mem_ctx,
                             NULL };
 
     if (cmd_ctx->domain == NULL) {
-        DEBUG(SSSDBG_CRIT_FAILURE, ("Domain is not set!\n"));
+        DEBUG(SSSDBG_CRIT_FAILURE, "Domain is not set!\n");
         return EFAULT;
     }
 
     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;
     }
 
@@ -564,8 +564,8 @@ static errno_t sudosrv_get_sudorules_from_cache(TALLOC_CTX *mem_ctx,
                                        NULL, &groupnames);
         if (ret != EOK) {
             DEBUG(SSSDBG_CRIT_FAILURE,
-                 ("Unable to retrieve user info [%d]: %s\n",
-                  ret, strerror(ret)));
+                 "Unable to retrieve user info [%d]: %s\n",
+                  ret, strerror(ret));
             goto done;
         }
         flags = SYSDB_SUDO_FILTER_USERINFO | SYSDB_SUDO_FILTER_INCLUDE_ALL;
@@ -583,12 +583,12 @@ static errno_t sudosrv_get_sudorules_from_cache(TALLOC_CTX *mem_ctx,
                                             &rules, &num_rules);
     if (ret != EOK) {
         DEBUG(SSSDBG_CRIT_FAILURE,
-             ("Unable to retrieve sudo rules [%d]: %s\n", ret, strerror(ret)));
+             "Unable to retrieve sudo rules [%d]: %s\n", ret, strerror(ret));
         goto done;
     }
 
-    DEBUG(SSSDBG_TRACE_FUNC, ("Returning %d rules for [%s@%s]\n",
-                              num_rules, debug_name, cmd_ctx->domain->name));
+    DEBUG(SSSDBG_TRACE_FUNC, "Returning %d rules for [%s@%s]\n",
+                              num_rules, debug_name, cmd_ctx->domain->name);
 
     if (_rules != NULL) {
         *_rules = talloc_steal(mem_ctx, rules);
@@ -631,12 +631,12 @@ static errno_t sudosrv_get_sudorules_query_cache(TALLOC_CTX *mem_ctx,
                                 flags, &filter);
     if (ret != EOK) {
         DEBUG(SSSDBG_CRIT_FAILURE,
-              ("Could not construct the search filter [%d]: %s\n",
-               ret, strerror(ret)));
+              "Could not construct the search filter [%d]: %s\n",
+               ret, strerror(ret));
         goto done;
     }
 
-    DEBUG(SSSDBG_FUNC_DATA, ("Searching sysdb with [%s]\n", filter));
+    DEBUG(SSSDBG_FUNC_DATA, "Searching sysdb with [%s]\n", filter);
 
     if (IS_SUBDOMAIN(domain)) {
         /* rules are stored inside parent domain tree */
@@ -647,7 +647,7 @@ static errno_t sudosrv_get_sudorules_query_cache(TALLOC_CTX *mem_ctx,
                               SUDORULE_SUBDIR, attrs,
                               &count, &msgs);
     if (ret != EOK && ret != ENOENT) {
-        DEBUG(SSSDBG_CRIT_FAILURE, ("Error looking up SUDO rules"));
+        DEBUG(SSSDBG_CRIT_FAILURE, "Error looking up SUDO rules");
         goto done;
     } if (ret == ENOENT) {
        *_rules = NULL;
@@ -659,14 +659,14 @@ static errno_t sudosrv_get_sudorules_query_cache(TALLOC_CTX *mem_ctx,
     ret = sysdb_msg2attrs(tmp_ctx, count, msgs, &rules);
     if (ret != EOK) {
         DEBUG(SSSDBG_CRIT_FAILURE,
-              ("Could not convert ldb message to sysdb_attrs\n"));
+              "Could not convert ldb message to sysdb_attrs\n");
         goto done;
     }
 
     ret = sort_sudo_rules(rules, count);
     if (ret != EOK) {
         DEBUG(SSSDBG_OP_FAILURE,
-              ("Could not sort rules by sudoOrder\n"));
+              "Could not sort rules by sudoOrder\n");
         goto done;
     }
 
@@ -689,7 +689,7 @@ sudo_order_cmp_fn(const void *a, const void *b)
     r1 = * (struct sysdb_attrs * const *) a;
     r2 = * (struct sysdb_attrs * const *) b;
     if (!r1 || !r2) {
-        DEBUG(SSSDBG_CRIT_FAILURE, ("BUG: Wrong data?\n"));
+        DEBUG(SSSDBG_CRIT_FAILURE, "BUG: Wrong data?\n");
         return 0;
     }
 
@@ -699,7 +699,7 @@ sudo_order_cmp_fn(const void *a, const void *b)
          * a value of 0 is assumed */
         o1 = 0;
     } else if (ret != EOK) {
-        DEBUG(SSSDBG_OP_FAILURE, ("Cannot get sudoOrder value\n"));
+        DEBUG(SSSDBG_OP_FAILURE, "Cannot get sudoOrder value\n");
         return 0;
     }
 
@@ -709,7 +709,7 @@ sudo_order_cmp_fn(const void *a, const void *b)
          * a value of 0 is assumed */
         o2 = 0;
     } else if (ret != EOK) {
-        DEBUG(SSSDBG_OP_FAILURE, ("Cannot get sudoOrder value\n"));
+        DEBUG(SSSDBG_OP_FAILURE, "Cannot get sudoOrder value\n");
         return 0;
     }