X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fnotify_desktop.c;h=e391cf275c04410ac76b67bbf6c896977f0fc74f;hp=d12ecb2c1462731de07abe9dd66752b90e89709e;hb=7111bb6df7628edce3a8e538b386fbe27633a191;hpb=063a5e75b36173e89ffa18d32d47509f6ef968ec

diff --git a/src/notify_desktop.c b/src/notify_desktop.c
index d12ecb2c..e391cf27 100644
--- a/src/notify_desktop.c
+++ b/src/notify_desktop.c
@@ -32,18 +32,17 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include <glib.h>
 #include <libnotify/notify.h>
 
 #ifndef NOTIFY_CHECK_VERSION
-# define NOTIFY_CHECK_VERSION(x,y,z) 0
+#define NOTIFY_CHECK_VERSION(x, y, z) 0
 #endif
 
-#define log_info(...) INFO ("notify_desktop: " __VA_ARGS__)
-#define log_warn(...) WARNING ("notify_desktop: " __VA_ARGS__)
-#define log_err(...) ERROR ("notify_desktop: " __VA_ARGS__)
+#define log_info(...) INFO("notify_desktop: " __VA_ARGS__)
+#define log_warn(...) WARNING("notify_desktop: " __VA_ARGS__)
+#define log_err(...) ERROR("notify_desktop: " __VA_ARGS__)
 
 #define DEFAULT_TIMEOUT 5000
 
@@ -51,128 +50,119 @@ static int okay_timeout = DEFAULT_TIMEOUT;
 static int warn_timeout = DEFAULT_TIMEOUT;
 static int fail_timeout = DEFAULT_TIMEOUT;
 
-static int set_timeout (oconfig_item_t *ci, int *timeout)
-{
-	if ((0 != ci->children_num) || (1 != ci->values_num)
-			|| (OCONFIG_TYPE_NUMBER != ci->values[0].type)) {
-		log_err ("%s expects a single number argument.", ci->key);
-		return 1;
-	}
-
-	*timeout = (int)ci->values[0].value.number;
-	if (0 > *timeout)
-		*timeout = DEFAULT_TIMEOUT;
-	return 0;
+static int set_timeout(oconfig_item_t *ci, int *timeout) {
+  if ((0 != ci->children_num) || (1 != ci->values_num) ||
+      (OCONFIG_TYPE_NUMBER != ci->values[0].type)) {
+    log_err("%s expects a single number argument.", ci->key);
+    return 1;
+  }
+
+  *timeout = (int)ci->values[0].value.number;
+  if (0 > *timeout)
+    *timeout = DEFAULT_TIMEOUT;
+  return 0;
 } /* set_timeout */
 
-static int c_notify_config (oconfig_item_t *ci)
-{
-	int i = 0;
-
-	for (i = 0; i < ci->children_num; ++i) {
-		oconfig_item_t *c = ci->children + i;
-
-		if (0 == strcasecmp (c->key, "OkayTimeout"))
-			set_timeout (c, &okay_timeout);
-		else if (0 == strcasecmp (c->key, "WarningTimeout"))
-			set_timeout (c, &warn_timeout);
-		else if (0 == strcasecmp (c->key, "FailureTimeout"))
-			set_timeout (c, &fail_timeout);
-	}
-	return 0;
+static int c_notify_config(oconfig_item_t *ci) {
+  for (int i = 0; i < ci->children_num; ++i) {
+    oconfig_item_t *c = ci->children + i;
+
+    if (0 == strcasecmp(c->key, "OkayTimeout"))
+      set_timeout(c, &okay_timeout);
+    else if (0 == strcasecmp(c->key, "WarningTimeout"))
+      set_timeout(c, &warn_timeout);
+    else if (0 == strcasecmp(c->key, "FailureTimeout"))
+      set_timeout(c, &fail_timeout);
+  }
+  return 0;
 } /* c_notify_config */
 
-static int c_notify (const notification_t *n,
-		user_data_t __attribute__((unused)) *user_data)
-{
-	NotifyNotification *notification = NULL;
-	NotifyUrgency       urgency      = NOTIFY_URGENCY_LOW;
-	int                 timeout      = okay_timeout;
-
-	char summary[1024];
-
-	if (NOTIF_WARNING == n->severity) {
-		urgency = NOTIFY_URGENCY_NORMAL;
-		timeout = warn_timeout;
-	}
-	else if (NOTIF_FAILURE == n->severity) {
-		urgency = NOTIFY_URGENCY_CRITICAL;
-		timeout = fail_timeout;
-	}
-
-	ssnprintf (summary, sizeof (summary), "collectd %s notification",
-			(NOTIF_FAILURE == n->severity) ? "FAILURE"
-				: (NOTIF_WARNING == n->severity) ? "WARNING"
-				: (NOTIF_OKAY == n->severity) ? "OKAY" : "UNKNOWN");
-
-	notification = notify_notification_new (summary, n->message, NULL
-#if NOTIFY_CHECK_VERSION (0, 7, 0)
-	);
+static int c_notify(const notification_t *n,
+                    user_data_t __attribute__((unused)) * user_data) {
+  NotifyNotification *notification = NULL;
+  NotifyUrgency urgency = NOTIFY_URGENCY_LOW;
+  int timeout = okay_timeout;
+
+  char summary[1024];
+
+  if (NOTIF_WARNING == n->severity) {
+    urgency = NOTIFY_URGENCY_NORMAL;
+    timeout = warn_timeout;
+  } else if (NOTIF_FAILURE == n->severity) {
+    urgency = NOTIFY_URGENCY_CRITICAL;
+    timeout = fail_timeout;
+  }
+
+  snprintf(summary, sizeof(summary), "collectd %s notification",
+           (NOTIF_FAILURE == n->severity)
+               ? "FAILURE"
+               : (NOTIF_WARNING == n->severity)
+                     ? "WARNING"
+                     : (NOTIF_OKAY == n->severity) ? "OKAY" : "UNKNOWN");
+
+  notification = notify_notification_new(summary, n->message, NULL
+#if NOTIFY_CHECK_VERSION(0, 7, 0)
+                                         );
 #else
-	, NULL);
+                                         ,
+                                         NULL);
 #endif
-	if (NULL == notification) {
-		log_err ("Failed to create a new notification.");
-		return -1;
-	}
+  if (NULL == notification) {
+    log_err("Failed to create a new notification.");
+    return -1;
+  }
 
-	notify_notification_set_urgency (notification, urgency);
-	notify_notification_set_timeout (notification, timeout);
+  notify_notification_set_urgency(notification, urgency);
+  notify_notification_set_timeout(notification, timeout);
 
-	if (! notify_notification_show (notification, NULL))
-		log_err ("Failed to display notification.");
+  if (!notify_notification_show(notification, NULL))
+    log_err("Failed to display notification.");
 
-	g_object_unref (G_OBJECT (notification));
-	return 0;
+  g_object_unref(G_OBJECT(notification));
+  return 0;
 } /* c_notify */
 
-static int c_notify_shutdown (void)
-{
-	plugin_unregister_init ("notify_desktop");
-	plugin_unregister_notification ("notify_desktop");
-	plugin_unregister_shutdown ("notify_desktop");
+static int c_notify_shutdown(void) {
+  plugin_unregister_init("notify_desktop");
+  plugin_unregister_notification("notify_desktop");
+  plugin_unregister_shutdown("notify_desktop");
 
-	if (notify_is_initted ())
-		notify_uninit ();
-	return 0;
+  if (notify_is_initted())
+    notify_uninit();
+  return 0;
 } /* c_notify_shutdown */
 
-static int c_notify_init (void)
-{
-	char *name         = NULL;
-	char *vendor       = NULL;
-	char *version      = NULL;
-	char *spec_version = NULL;
-
-	if (! notify_init (PACKAGE_STRING)) {
-		log_err ("Failed to initialize libnotify.");
-		return -1;
-	}
-
-	if (! notify_get_server_info (&name, &vendor, &version, &spec_version))
-		log_warn ("Failed to get the notification server info. "
-				"Check if you have a notification daemon running.");
-	else {
-		log_info ("Found notification daemon: %s (%s) %s (spec version %s)",
-				name, vendor, version, spec_version);
-		free (name);
-		free (vendor);
-		free (version);
-		free (spec_version);
-	}
-
-	plugin_register_notification ("notify_desktop", c_notify,
-			/* user_data = */ NULL);
-	plugin_register_shutdown ("notify_desktop", c_notify_shutdown);
-	return 0;
+static int c_notify_init(void) {
+  char *name = NULL;
+  char *vendor = NULL;
+  char *version = NULL;
+  char *spec_version = NULL;
+
+  if (!notify_init(PACKAGE_STRING)) {
+    log_err("Failed to initialize libnotify.");
+    return -1;
+  }
+
+  if (!notify_get_server_info(&name, &vendor, &version, &spec_version))
+    log_warn("Failed to get the notification server info. "
+             "Check if you have a notification daemon running.");
+  else {
+    log_info("Found notification daemon: %s (%s) %s (spec version %s)", name,
+             vendor, version, spec_version);
+    free(name);
+    free(vendor);
+    free(version);
+    free(spec_version);
+  }
+
+  plugin_register_notification("notify_desktop", c_notify,
+                               /* user_data = */ NULL);
+  plugin_register_shutdown("notify_desktop", c_notify_shutdown);
+  return 0;
 } /* c_notify_init */
 
-void module_register (void)
-{
-	plugin_register_complex_config ("notify_desktop", c_notify_config);
-	plugin_register_init ("notify_desktop", c_notify_init);
-	return;
+void module_register(void) {
+  plugin_register_complex_config("notify_desktop", c_notify_config);
+  plugin_register_init("notify_desktop", c_notify_init);
+  return;
 } /* module_register */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
-