From d75eb5652b8740163c11f866bcb128a71913c6c9 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn@redhat.com>
Date: Mon, 11 Jan 2016 18:54:40 +0100
Subject: [PATCH 1/6] UTIL: Use prefix for debug function

---
 src/providers/ipa/ipa_access.c |  4 ++--
 src/util/debug.c               | 12 ++++++------
 src/util/sss_semanage.c        |  2 +-
 src/util/util.h                | 16 ++++++++--------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/providers/ipa/ipa_access.c b/src/providers/ipa/ipa_access.c
index 65a791c3fe4b56d0f50d6e501a69d6d4b13f1d9a..e6028ed8f50f524bd837ec9341773f88aa2a5a2b 100644
--- a/src/providers/ipa/ipa_access.c
+++ b/src/providers/ipa/ipa_access.c
@@ -77,8 +77,8 @@ void hbac_debug_messages(const char *file, int line,
             return;
         }
 
-        debug_fn(__FILE__, __LINE__, "hbac", loglevel, "[%s:%i] %s",
-                 file, line, message);
+        sss_debug_fn(__FILE__, __LINE__, "hbac", loglevel, "[%s:%i] %s",
+                     file, line, message);
         free(message);
     }
 }
diff --git a/src/util/debug.c b/src/util/debug.c
index a8eea32740155ec3daf6be71ef9a8af6592f74a9..c0a7732e90a1727f7c9514ad7ee6daf426b6075b 100644
--- a/src/util/debug.c
+++ b/src/util/debug.c
@@ -206,11 +206,11 @@ journal_done:
 }
 #endif /* WiTH_JOURNALD */
 
-void debug_fn(const char *file,
-              long line,
-              const char *function,
-              int level,
-              const char *format, ...)
+void sss_debug_fn(const char *file,
+                  long line,
+                  const char *function,
+                  int level,
+                  const char *format, ...)
 {
     va_list ap;
     struct timeval tv;
@@ -301,7 +301,7 @@ void ldb_debug_messages(void *context, enum ldb_debug_level level,
     }
 
     if (DEBUG_IS_SET(loglevel))
-        debug_fn(__FILE__, __LINE__, "ldb", loglevel, "%s\n", message);
+        sss_debug_fn(__FILE__, __LINE__, "ldb", loglevel, "%s\n", message);
 
     free(message);
 }
diff --git a/src/util/sss_semanage.c b/src/util/sss_semanage.c
index d1d03988c05dc011dbd465051d50fe6acca4f845..4fb9df589bbfddcc815ed321b6e3b32655d44a0c 100644
--- a/src/util/sss_semanage.c
+++ b/src/util/sss_semanage.c
@@ -64,7 +64,7 @@ static void sss_semanage_error_callback(void *varg,
     }
 
     if (DEBUG_IS_SET(level))
-        debug_fn(__FILE__, __LINE__, "libsemanage", level, "%s\n", message);
+        sss_debug_fn(__FILE__, __LINE__, "libsemanage", level, "%s\n", message);
     free(message);
 }
 
diff --git a/src/util/util.h b/src/util/util.h
index e1245bb0fbab742dd58522f1892c66d08a45b59c..662d786ad362027e2f816688a02fd6fab36df14c 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -77,11 +77,11 @@ extern int debug_microseconds;
 extern int debug_to_file;
 extern int debug_to_stderr;
 extern const char *debug_log_file;
-void debug_fn(const char *file,
-              long line,
-              const char *function,
-              int level,
-              const char *format, ...) SSS_ATTRIBUTE_PRINTF(5,6);
+void sss_debug_fn(const char *file,
+                  long line,
+                  const char *function,
+                  int level,
+                  const char *format, ...) SSS_ATTRIBUTE_PRINTF(5, 6);
 int debug_convert_old_level(int old_level);
 errno_t set_debug_file_from_fd(const int fd);
 int get_fd_from_debug_file(void);
@@ -135,9 +135,9 @@ int get_fd_from_debug_file(void);
 #define DEBUG(level, format, ...) do { \
     int __debug_macro_level = level; \
     if (DEBUG_IS_SET(__debug_macro_level)) { \
-        debug_fn(__FILE__, __LINE__, __FUNCTION__, \
-                 __debug_macro_level, \
-                 format, ##__VA_ARGS__); \
+        sss_debug_fn(__FILE__, __LINE__, __FUNCTION__, \
+                     __debug_macro_level, \
+                     format, ##__VA_ARGS__); \
     } \
 } while (0)
 
-- 
2.5.0