diff options
author | Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com> | 2013-12-20 16:12:34 +0200 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2014-05-02 10:58:33 +0200 |
commit | dad68b3284228a38b4beb06946701e8795980966 (patch) | |
tree | 23927ab0522933c7a29edbdc36e336730447dc51 | |
parent | b0d759c9a604add0573c04b1a4e88e1605e1fdc0 (diff) | |
download | sssd-dad68b3284228a38b4beb06946701e8795980966.tar.gz sssd-dad68b3284228a38b4beb06946701e8795980966.tar.xz sssd-dad68b3284228a38b4beb06946701e8795980966.zip |
Fixup DEBUG macro invocations update
Fix mistakes made by the update script in "Make DEBUG macro invocations
variadic".
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
Reviewed-by: Stephen Gallagher <sgallagh@redhat.com>
Reviewed-by: Simo Sorce <simo@redhat.com>
(cherry picked from commit 45a1d9d597df977354428440aeff11c6a0a947fe)
-rw-r--r-- | src/tools/selinux.c | 4 | ||||
-rw-r--r-- | src/util/util.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/selinux.c b/src/tools/selinux.c index 9e7890099..a1bd2ec0b 100644 --- a/src/tools/selinux.c +++ b/src/tools/selinux.c @@ -92,7 +92,7 @@ int reset_selinux_file_context(void) #ifdef HAVE_SEMANAGE /* turn libselinux messages into SSSD DEBUG() calls */ -static void sss_semanage_error_callbackvoid *varg, +static void sss_semanage_error_callback(void *varg, semanage_handle_t *handle, const char *fmt, ...) { @@ -133,7 +133,7 @@ static semanage_handle_t *sss_semanage_init(void) handle = semanage_handle_create(); if (!handle) { - DEBUG(1, ("Cannot create SELinux management handle\n"); + DEBUG(1, "Cannot create SELinux management handle\n"); return NULL; } diff --git a/src/util/util.h b/src/util/util.h index 32b9240fe..1390a9e14 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -123,7 +123,7 @@ errno_t set_debug_file_from_fd(const int fd); newline-terminated message \param ... the debug message format arguments */ -#define DEBUGlevel, format, ...) do { \ +#define DEBUG(level, format, ...) do { \ int __debug_macro_newlevel = debug_get_level(level); \ if (DEBUG_IS_SET(__debug_macro_newlevel)) \ debug_fn(__FUNCTION__, __debug_macro_newlevel, format, ##__VA_ARGS__); \ @@ -170,7 +170,7 @@ errno_t set_debug_file_from_fd(const int fd); #define FLAGS_PID_FILE 0x0004 #ifndef talloc_zfree -#define talloc_zfree(ptr) do { talloc_free(discard_const(ptr); ptr = NULL; } while(0) +#define talloc_zfree(ptr) do { talloc_free(discard_const(ptr)); ptr = NULL; } while(0) #endif #ifndef discard_const_p |