Various plugins: Use the IS_TRUE and IS_FALSE macros everywhere.

[collectd.git] / src / logfile.c

diff --git a/src/logfile.c b/src/logfile.c
index 36ac58d..7b96ac5 100644 (file)
--- a/src/logfile.c
+++ b/src/logfile.c
@@ -74,9 +74,7 @@ static int logfile_config (const char *key, const char *value)
                log_file = strdup (value);
        }
        else if (0 == strcasecmp (key, "Timestamp")) {
-               if ((strcasecmp (value, "false") == 0)
-                               || (strcasecmp (value, "no") == 0)
-                               || (strcasecmp (value, "off") == 0))
+               if (IS_FALSE (value))
                        print_timestamp = 0;
                else
                        print_timestamp = 1;
@@ -143,7 +141,8 @@ static void logfile_print (const char *msg, time_t timestamp_time)
        return;
 } /* void logfile_print */
 
-static void logfile_log (int severity, const char *msg)
+static void logfile_log (int severity, const char *msg,
+               user_data_t __attribute__((unused)) *user_data)
 {
        if (severity > log_level)
                return;
@@ -151,14 +150,15 @@ static void logfile_log (int severity, const char *msg)
        logfile_print (msg, time (NULL));
 } /* void logfile_log (int, const char *) */
 
-static int logfile_notification (const notification_t *n)
+static int logfile_notification (const notification_t *n,
+               user_data_t __attribute__((unused)) *user_data)
 {
        char  buf[1024] = "";
        char *buf_ptr = buf;
        int   buf_len = sizeof (buf);
        int status;
 
-       status = snprintf (buf_ptr, buf_len, "Notification: severity = %s",
+       status = ssnprintf (buf_ptr, buf_len, "Notification: severity = %s",
                        (n->severity == NOTIF_FAILURE) ? "FAILURE"
                        : ((n->severity == NOTIF_WARNING) ? "WARNING"
                                : ((n->severity == NOTIF_OKAY) ? "OKAY" : "UNKNOWN")));
@@ -170,7 +170,7 @@ static int logfile_notification (const notification_t *n)
 
 #define APPEND(bufptr, buflen, key, value) \
        if ((buflen > 0) && (strlen (value) > 0)) { \
-               int status = snprintf (bufptr, buflen, ", %s = %s", key, value); \
+               int status = ssnprintf (bufptr, buflen, ", %s = %s", key, value); \
                if (status > 0) { \
                        bufptr += status; \
                        buflen -= status; \
@@ -185,7 +185,8 @@ static int logfile_notification (const notification_t *n)
 
        buf[sizeof (buf) - 1] = '\0';
 
-       logfile_print (buf, n->time);
+       logfile_print (buf,
+                       (n->time > 0) ? n->time : time (NULL));
 
        return (0);
 } /* int logfile_notification */
@@ -194,8 +195,9 @@ void module_register (void)
 {
        plugin_register_config ("logfile", logfile_config,
                        config_keys, config_keys_num);
-       plugin_register_log ("logfile", logfile_log);
-       plugin_register_notification ("logfile", logfile_notification);
+       plugin_register_log ("logfile", logfile_log, /* user_data = */ NULL);
+       plugin_register_notification ("logfile", logfile_notification,
+                       /* user_data = */ NULL);
 } /* void module_register (void) */
 
 /* vim: set sw=4 ts=4 tw=78 noexpandtab : */