Merge branch 'collectd-5.7' into collectd-5.8

[collectd.git] / src / xmms.c

diff --git a/src/xmms.c b/src/xmms.c
index 1728cf1..3e3a3c3 100644 (file)
--- a/src/xmms.c
+++ b/src/xmms.c
@@ -34,14 +34,10 @@
 static gint xmms_session;
 
 static void cxmms_submit(const char *type, gauge_t value) {
-  value_t values[1];
   value_list_t vl = VALUE_LIST_INIT;
 
-  values[0].gauge = value;
-
-  vl.values = values;
+  vl.values = &(value_t){.gauge = value};
   vl.values_len = 1;
-  sstrncpy(vl.host, hostname_g, sizeof(vl.host));
   sstrncpy(vl.plugin, "xmms", sizeof(vl.plugin));
   sstrncpy(vl.type, type, sizeof(vl.type));
 
@@ -54,23 +50,19 @@ static int cxmms_read(void) {
   gint nch;
 
   if (!xmms_remote_is_running(xmms_session))
-    return (0);
+    return 0;
 
   xmms_remote_get_info(xmms_session, &rate, &freq, &nch);
 
   if ((freq == 0) || (nch == 0))
-    return (-1);
+    return -1;
 
   cxmms_submit("bitrate", rate);
   cxmms_submit("frequency", freq);
 
-  return (0);
+  return 0;
 } /* int read */
 
 void module_register(void) {
   plugin_register_read("xmms", cxmms_read);
 } /* void module_register */
-
-/*
- * vim: shiftwidth=2:softtabstop=2:textwidth=78
- */