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

diff --git a/src/providers/krb5/krb5_become_user.c b/src/providers/krb5/krb5_become_user.c
index 4d5346f37..6ddb35a56 100644
--- a/src/providers/krb5/krb5_become_user.c
+++ b/src/providers/krb5/krb5_become_user.c
@@ -32,12 +32,12 @@ errno_t become_user(uid_t uid, gid_t gid)
     int ret;
 
     DEBUG(SSSDBG_FUNC_DATA,
-          ("Trying to become user [%"SPRIuid"][%"SPRIgid"].\n", uid, gid));
+          "Trying to become user [%"SPRIuid"][%"SPRIgid"].\n", uid, gid);
 
     /* skip call if we already are the requested user */
     cuid = geteuid();
     if (uid == cuid) {
-        DEBUG(SSSDBG_FUNC_DATA, ("Already user [%"SPRIuid"].\n", uid));
+        DEBUG(SSSDBG_FUNC_DATA, "Already user [%"SPRIuid"].\n", uid);
         return EOK;
     }
 
@@ -46,7 +46,7 @@ errno_t become_user(uid_t uid, gid_t gid)
     if (ret == -1) {
         ret = errno;
         DEBUG(SSSDBG_CRIT_FAILURE,
-              ("setgroups failed [%d][%s].\n", ret, strerror(ret)));
+              "setgroups failed [%d][%s].\n", ret, strerror(ret));
         return ret;
     }
 
@@ -55,7 +55,7 @@ errno_t become_user(uid_t uid, gid_t gid)
     if (ret == -1) {
         ret = errno;
         DEBUG(SSSDBG_CRIT_FAILURE,
-              ("setresgid failed [%d][%s].\n", ret, strerror(ret)));
+              "setresgid failed [%d][%s].\n", ret, strerror(ret));
         return ret;
     }
 
@@ -65,7 +65,7 @@ errno_t become_user(uid_t uid, gid_t gid)
     if (ret == -1) {
         ret = errno;
         DEBUG(SSSDBG_CRIT_FAILURE,
-              ("setresuid failed [%d][%s].\n", ret, strerror(ret)));
+              "setresuid failed [%d][%s].\n", ret, strerror(ret));
         return ret;
     }
 
@@ -92,22 +92,22 @@ errno_t switch_creds(TALLOC_CTX *mem_ctx,
     int size;
     int ret;
 
-    DEBUG(SSSDBG_FUNC_DATA, ("Switch user to [%d][%d].\n", uid, gid));
+    DEBUG(SSSDBG_FUNC_DATA, "Switch user to [%d][%d].\n", uid, gid);
 
     if (saved_creds) {
         /* save current user credentials */
         size = getgroups(0, NULL);
         if (size == -1) {
             ret = errno;
-            DEBUG(SSSDBG_CRIT_FAILURE, ("Getgroups failed! (%d, %s)\n",
-                                        ret, strerror(ret)));
+            DEBUG(SSSDBG_CRIT_FAILURE, "Getgroups failed! (%d, %s)\n",
+                                        ret, strerror(ret));
             goto done;
         }
 
         ssc = talloc_size(mem_ctx,
                           (sizeof(struct sss_creds) + size * sizeof(gid_t)));
         if (!ssc) {
-            DEBUG(SSSDBG_CRIT_FAILURE, ("Allocation failed!\n"));
+            DEBUG(SSSDBG_CRIT_FAILURE, "Allocation failed!\n");
             ret = ENOMEM;
             goto done;
         }
@@ -116,8 +116,8 @@ errno_t switch_creds(TALLOC_CTX *mem_ctx,
         size = getgroups(ssc->num_gids, ssc->gids);
         if (size == -1) {
             ret = errno;
-            DEBUG(SSSDBG_CRIT_FAILURE, ("Getgroups failed! (%d, %s)\n",
-                                        ret, strerror(ret)));
+            DEBUG(SSSDBG_CRIT_FAILURE, "Getgroups failed! (%d, %s)\n",
+                                        ret, strerror(ret));
             /* free ssc immediately otherwise the code will try to restore
              * wrong creds */
             talloc_zfree(ssc);
@@ -137,7 +137,7 @@ errno_t switch_creds(TALLOC_CTX *mem_ctx,
         if (ret == -1) {
             ret = errno;
             DEBUG(SSSDBG_CRIT_FAILURE,
-                  ("setresuid failed [%d][%s].\n", ret, strerror(ret)));
+                  "setresuid failed [%d][%s].\n", ret, strerror(ret));
             goto done;
         }
     }
@@ -151,7 +151,7 @@ errno_t switch_creds(TALLOC_CTX *mem_ctx,
     if (ret == -1) {
         ret = errno;
         DEBUG(SSSDBG_TRACE_FUNC,
-              ("setgroups failed [%d][%s].\n", ret, strerror(ret)));
+              "setgroups failed [%d][%s].\n", ret, strerror(ret));
     }
 
     /* change gid now, (leaves saved gid to current, so we can restore) */
@@ -159,7 +159,7 @@ errno_t switch_creds(TALLOC_CTX *mem_ctx,
     if (ret == -1) {
         ret = errno;
         DEBUG(SSSDBG_CRIT_FAILURE,
-              ("setresgid failed [%d][%s].\n", ret, strerror(ret)));
+              "setresgid failed [%d][%s].\n", ret, strerror(ret));
         goto done;
     }
 
@@ -169,7 +169,7 @@ errno_t switch_creds(TALLOC_CTX *mem_ctx,
         if (ret == -1) {
             ret = errno;
             DEBUG(SSSDBG_CRIT_FAILURE,
-                  ("setresuid failed [%d][%s].\n", ret, strerror(ret)));
+                  "setresuid failed [%d][%s].\n", ret, strerror(ret));
             goto done;
         }
     }