1 files changed, 7 insertions, 51 deletions
diff --git a/log.h b/log.h
index 3077c2e..0259abd 100644
--- a/log.h
+++ b/log.h
@@ -15,54 +15,10 @@
 /* last message before exit */
 #define EMERG 7
 
-/* Not all compilers support __func__ or an equivalent. */
-#if (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) && !defined(__GNUC__)
-# if defined(_MSC_VER) && _MSC_VER >= 1300
-#  define __func__ __FUNCTION__
-# else
-#  define DSS_NO_FUNC_NAMES
-#  define __func__ "<unknown>"
-# endif
-#endif
-
-#define DSS_DEBUG_LOG(args) \
-	do { \
-		dss_log_set_params(DEBUG, __FILE__, __LINE__, __func__); \
-		dss_log args ; \
-	} while (0)
-
-#define DSS_INFO_LOG(args) \
-	do { \
-		dss_log_set_params(INFO, __FILE__, __LINE__, __func__); \
-		dss_log args ; \
-	} while (0)
-
-#define DSS_NOTICE_LOG(args) \
-	do { \
-		dss_log_set_params(NOTICE, __FILE__, __LINE__, __func__); \
-		dss_log args ; \
-	} while (0)
-
-#define DSS_WARNING_LOG(args) \
-	do { \
-		dss_log_set_params(WARNING, __FILE__, __LINE__, __func__); \
-		dss_log args ; \
-	} while (0)
-
-#define DSS_ERROR_LOG(args) \
-	do { \
-		dss_log_set_params(ERROR, __FILE__, __LINE__, __func__); \
-		dss_log args ; \
-	} while (0)
-
-#define DSS_CRIT_LOG(args) \
-	do { \
-		dss_log_set_params(CRIT, __FILE__, __LINE__, __func__); \
-		dss_log args ; \
-	} while (0)
-
-#define DSS_EMERG_LOG(args) \
-	do { \
-		dss_log_set_params(EMERG, __FILE__, __LINE__, __func__); \
-		dss_log args ; \
-	} while (0)
+#define DSS_DEBUG_LOG(f,...) dss_log(DEBUG, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
+#define DSS_INFO_LOG(f,...) dss_log(INFO, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
+#define DSS_NOTICE_LOG(f,...) dss_log(NOTICE, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
+#define DSS_WARNING_LOG(f,...) dss_log(WARNING, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
+#define DSS_ERROR_LOG(f,...) dss_log(ERROR, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
+#define DSS_CRIT_LOG(f,...) dss_log(CRIT, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
+#define DSS_EMERG_LOG(f,...) dss_log(EMERG, "%s: " f, __FUNCTION__, ## __VA_ARGS__)