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

diff --git a/src/tools/sss_groupshow.c b/src/tools/sss_groupshow.c
index 02df6d4b4..8689760d8 100644
--- a/src/tools/sss_groupshow.c
+++ b/src/tools/sss_groupshow.c
@@ -80,7 +80,7 @@ static int parse_memberofs(struct ldb_context *ldb,
         if (gi->memberofs[i] == NULL) {
             return ENOMEM;
         }
-        DEBUG(6, ("memberof value: %s\n", gi->memberofs[i]));
+        DEBUG(6, "memberof value: %s\n", gi->memberofs[i]);
     }
     gi->memberofs[el->num_values] = NULL;
 
@@ -140,7 +140,7 @@ static int parse_members(TALLOC_CTX *mem_ctx,
                 ret = ENOMEM;
                 goto fail;
             }
-            DEBUG(6, ("User member %s\n", um[um_index]));
+            DEBUG(6, "User member %s\n", um[um_index]);
             um_index++;
         } else if (ldb_dn_compare_base(parent_dn, group_basedn) == 0) {
             gm[gm_index] = rdn_as_string(mem_ctx, dn);
@@ -149,15 +149,15 @@ static int parse_members(TALLOC_CTX *mem_ctx,
                 goto fail;
             }
             if (parent_name && strcmp(gm[gm_index], parent_name) == 0) {
-                DEBUG(6, ("Skipping circular nesting for group %s\n",
-                          gm[gm_index]));
+                DEBUG(6, "Skipping circular nesting for group %s\n",
+                          gm[gm_index]);
                 continue;
             }
-            DEBUG(6, ("Group member %s\n", gm[gm_index]));
+            DEBUG(6, "Group member %s\n", gm[gm_index]);
             gm_index++;
         } else {
-            DEBUG(2, ("Group member not a user nor group: %s\n",
-                        ldb_dn_get_linearized(dn)));
+            DEBUG(2, "Group member not a user nor group: %s\n",
+                        ldb_dn_get_linearized(dn));
             ret = EIO;
             goto fail;
         }
@@ -216,7 +216,7 @@ static int process_group(TALLOC_CTX *mem_ctx,
     struct group_info *gi = NULL;
     const char **user_members;
 
-    DEBUG(6, ("Found entry %s\n", ldb_dn_get_linearized(msg->dn)));
+    DEBUG(6, "Found entry %s\n", ldb_dn_get_linearized(msg->dn));
 
     gi = talloc_zero(mem_ctx, struct group_info);
     if (!gi) {
@@ -232,7 +232,7 @@ static int process_group(TALLOC_CTX *mem_ctx,
     gi->gid = ldb_msg_find_attr_as_uint64(msg,
                                           SYSDB_GIDNUM, 0);
     if (gi->gid == 0 || gi->name == NULL) {
-        DEBUG(3, ("No name or no GID?\n"));
+        DEBUG(3, "No name or no GID?\n");
         ret = EIO;
         goto done;
     }
@@ -334,7 +334,7 @@ int group_show(TALLOC_CTX *mem_ctx,
     /* First, search for the root group */
     ret = sysdb_search_group_by_name(mem_ctx, domain, name, attrs, &msg);
     if (ret) {
-        DEBUG(2, ("Search failed: %s (%d)\n", strerror(ret), ret));
+        DEBUG(2, "Search failed: %s (%d)\n", strerror(ret), ret);
         goto done;
     }
 
@@ -342,8 +342,8 @@ int group_show(TALLOC_CTX *mem_ctx,
                         msg, domain, NULL, &root,
                         &group_members, &nmembers);
     if (ret != EOK) {
-        DEBUG(2, ("Group processing failed: %s (%d)\n",
-                   strerror(ret), ret));
+        DEBUG(2, "Group processing failed: %s (%d)\n",
+                   strerror(ret), ret);
         goto done;
     }
 
@@ -392,7 +392,7 @@ int group_show(TALLOC_CTX *mem_ctx,
                              group_members, nmembers,
                              &root->group_members);
     if (ret) {
-        DEBUG(2, ("Recursive search failed: %s (%d)\n", strerror(ret), ret));
+        DEBUG(2, "Recursive search failed: %s (%d)\n", strerror(ret), ret);
         goto done;
     }
 
@@ -446,8 +446,8 @@ static int group_show_trim_memberof(TALLOC_CTX *mem_ctx,
             name = ldb_msg_find_attr_as_string(msgs[0],
                                                SYSDB_NAME, NULL);
             if (!name) {
-                DEBUG(2, ("Entry %s has no Name Attribute ?!?\n",
-                      ldb_dn_get_linearized(msgs[0]->dn)));
+                DEBUG(2, "Entry %s has no Name Attribute ?!?\n",
+                      ldb_dn_get_linearized(msgs[0]->dn));
                 return EFAULT;
             }
 
@@ -507,7 +507,7 @@ int group_show_recurse(TALLOC_CTX *mem_ctx,
         ret = sysdb_search_group_by_name(mem_ctx, domain, group_members[i],
                                          attrs, &msg);
         if (ret) {
-            DEBUG(2, ("Search failed: %s (%d)\n", strerror(ret), ret));
+            DEBUG(2, "Search failed: %s (%d)\n", strerror(ret), ret);
             return EIO;
         }
 
@@ -515,8 +515,8 @@ int group_show_recurse(TALLOC_CTX *mem_ctx,
                             msg, domain, parent->name,
                             &groups[i], &new_group_members, &new_nmembers);
         if (ret != EOK) {
-            DEBUG(2, ("Group processing failed: %s (%d)\n",
-                      strerror(ret), ret));
+            DEBUG(2, "Group processing failed: %s (%d)\n",
+                      strerror(ret), ret);
             return ret;
         }
 
@@ -527,8 +527,8 @@ int group_show_recurse(TALLOC_CTX *mem_ctx,
                                      new_group_members, new_nmembers,
                                      &parent->group_members);
             if (ret != EOK) {
-                DEBUG(2, ("Recursive search failed: %s (%d)\n",
-                          strerror(ret), ret));
+                DEBUG(2, "Recursive search failed: %s (%d)\n",
+                          strerror(ret), ret);
                 return ret;
             }
             talloc_zfree(new_group_members);
@@ -559,7 +559,7 @@ static int group_show_mpg(TALLOC_CTX *mem_ctx,
 
     ret = sysdb_search_user_by_name(info, domain, name, attrs, &msg);
     if (ret) {
-        DEBUG(2, ("Search failed: %s (%d)\n", strerror(ret), ret));
+        DEBUG(2, "Search failed: %s (%d)\n", strerror(ret), ret);
         goto fail;
     }
 
@@ -568,7 +568,7 @@ static int group_show_mpg(TALLOC_CTX *mem_ctx,
                                                            SYSDB_NAME, NULL));
     info->gid = ldb_msg_find_attr_as_uint64(msg, SYSDB_UIDNUM, 0);
     if (info->gid == 0 || info->name == NULL) {
-        DEBUG(3, ("No name or no GID?\n"));
+        DEBUG(3, "No name or no GID?\n");
         ret = EIO;
         goto fail;
     }
@@ -656,7 +656,7 @@ int main(int argc, const char **argv)
 
     ret = set_locale();
     if (ret != EOK) {
-        DEBUG(1, ("set_locale failed (%d): %s\n", ret, strerror(ret)));
+        DEBUG(1, "set_locale failed (%d): %s\n", ret, strerror(ret));
         ERROR("Error setting the locale\n");
         ret = EXIT_FAILURE;
         goto fini;
@@ -688,7 +688,7 @@ int main(int argc, const char **argv)
 
     ret = init_sss_tools(&tctx);
     if (ret != EOK) {
-        DEBUG(1, ("init_sss_tools failed (%d): %s\n", ret, strerror(ret)));
+        DEBUG(1, "init_sss_tools failed (%d): %s\n", ret, strerror(ret));
         if (ret == ENOENT) {
             ERROR("Error initializing the tools - no local domain\n");
         } else {
@@ -716,7 +716,7 @@ int main(int argc, const char **argv)
 
     /* Process result */
     if (ret) {
-        DEBUG(1, ("sysdb operation failed (%d)[%s]\n", ret, strerror(ret)));
+        DEBUG(1, "sysdb operation failed (%d)[%s]\n", ret, strerror(ret));
         switch (ret) {
             case ENOENT:
                 ERROR("No such group in local domain. "