python: Added support for subsecond interval.

[collectd.git] / src / notify_email.c

diff --git a/src/notify_email.c b/src/notify_email.c
index dc4e47f..a13b1f9 100644 (file)
--- a/src/notify_email.c
+++ b/src/notify_email.c
@@ -61,7 +61,7 @@ static char *email_subject = NULL;
 
 /* Callback to get username and password */
 static int authinteract (auth_client_request_t request, char **result,
-    int fields, void *arg)
+    int fields, void __attribute__((unused)) *arg)
 {               
   int i;
   for (i = 0; i < fields; i++)
@@ -78,7 +78,7 @@ static int authinteract (auth_client_request_t request, char **result,
 
 /* Callback to print the recipient status */
 static void print_recipient_status (smtp_recipient_t recipient,
-    const char *mailbox, void *arg)
+    const char *mailbox, void __attribute__((unused)) *arg)
 {
   const smtp_status_t *status;
 
@@ -90,7 +90,8 @@ static void print_recipient_status (smtp_recipient_t recipient,
 } /* void print_recipient_status */
 
 /* Callback to monitor SMTP activity */
-static void monitor_cb (const char *buf, int buflen, int writing, void *arg)
+static void monitor_cb (const char *buf, int buflen, int writing,
+    void __attribute__((unused)) *arg)
 {
   char log_str[MAXSTRING];
 
@@ -202,10 +203,12 @@ static int notify_email_config (const char *key, const char *value)
   return 0;
 } /* int notify_email_config (const char *, const char *) */
 
-static int notify_email_notification (const notification_t *n)
+static int notify_email_notification (const notification_t *n,
+    user_data_t __attribute__((unused)) *user_data)
 {
   smtp_recipient_t recipient;
 
+  time_t tt;
   struct tm timestamp_tm;
   char timestamp_str[64];
 
@@ -225,7 +228,8 @@ static int notify_email_notification (const notification_t *n)
       (email_subject == NULL) ? DEFAULT_SMTP_SUBJECT : email_subject,
       severity, n->host);
 
-  localtime_r (&n->time, &timestamp_tm);
+  tt = CDTIME_T_TO_TIME_T (n->time);
+  localtime_r (&tt, &timestamp_tm);
   strftime (timestamp_str, sizeof (timestamp_str), "%Y-%m-%d %H:%M:%S",
       &timestamp_tm);
   timestamp_str[sizeof (timestamp_str) - 1] = '\0';
@@ -281,7 +285,8 @@ void module_register (void)
   plugin_register_shutdown ("notify_email", notify_email_shutdown);
   plugin_register_config ("notify_email", notify_email_config,
       config_keys, config_keys_num);
-  plugin_register_notification ("notify_email", notify_email_notification);
+  plugin_register_notification ("notify_email", notify_email_notification,
+      /* user_data = */ NULL);
 } /* void module_register (void) */
 
 /* vim: set sw=2 sts=2 ts=8 et : */