Merge pull request #1575 from rubenk/dragonflybsd-utils-mount

Fix build on DragonFlyBSD

diff --git a/configure.ac b/configure.ac
index 5c6720c..fb9ef34 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1398,6 +1398,7 @@ AC_CHECK_MEMBERS([struct kinfo_proc.kp_proc, struct kinfo_proc.kp_eproc],
 
 AC_CHECK_MEMBERS([struct udphdr.uh_dport, struct udphdr.uh_sport], [], [],
 [#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 #if HAVE_STDINT_H
 # include <stdint.h>
 #endif
@@ -1419,6 +1420,7 @@ AC_CHECK_MEMBERS([struct udphdr.uh_dport, struct udphdr.uh_sport], [], [],
 ])
 AC_CHECK_MEMBERS([struct udphdr.dest, struct udphdr.source], [], [],
 [#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 #if HAVE_STDINT_H
 # include <stdint.h>
 #endif

diff --git a/src/battery.c b/src/battery.c
index 4178d8b..d921484 100644 (file)
--- a/src/battery.c
+++ b/src/battery.c
@@ -111,7 +111,7 @@ static void battery_submit (const char *plugin_instance, const char *type, doubl
 } /* void battery_submit */
 
 #if HAVE_IOKIT_PS_IOPOWERSOURCES_H || HAVE_IOKIT_IOKITLIB_H
-double dict_get_double (CFDictionaryRef dict, char *key_string)
+static double dict_get_double (CFDictionaryRef dict, char *key_string)
 {
        double      val_double;
        long long   val_int;

diff --git a/src/bind.c b/src/bind.c
index f9cf79e..28d28b6 100644 (file)
--- a/src/bind.c
+++ b/src/bind.c
@@ -726,8 +726,6 @@ static int bind_xml_stats_search_zones (int version, xmlDoc *doc, /* {{{ */
 
   for (i = 0; i < zone_nodes->nodesetval->nodeNr; i++)
   {
-    xmlNode *node;
-
     node = zone_nodes->nodesetval->nodeTab[i];
     assert (node != NULL);
 

diff --git a/src/collectdctl.c b/src/collectdctl.c
index 0b8d0c1..478f2a4 100644 (file)
--- a/src/collectdctl.c
+++ b/src/collectdctl.c
@@ -551,14 +551,14 @@ int main (int argc, char **argv) {
   int status;
 
   while (42) {
-    int c;
+    int n;
 
-    c = getopt (argc, argv, "s:h");
+    n = getopt (argc, argv, "s:h");
 
-    if (c == -1)
+    if (n == -1)
       break;
 
-    switch (c) {
+    switch (n) {
       case 's':
         snprintf (address, sizeof (address), "unix:%s", optarg);
         address[sizeof (address) - 1] = '\0';

diff --git a/src/dns.c b/src/dns.c
index 1fb7cb8..3421c47 100644 (file)
--- a/src/dns.c
+++ b/src/dns.c
@@ -21,6 +21,7 @@
  *   Mirko Buffoni <briareos at eswat.org>
  **/
 
+#define _DEFAULT_SOURCE
 #define _BSD_SOURCE
 
 #include "collectd.h"

diff --git a/src/exec.c b/src/exec.c
index 0445b14..d560f46 100644 (file)
--- a/src/exec.c
+++ b/src/exec.c
@@ -23,6 +23,7 @@
  *   Peter Holik <peter at holik.at>
  **/
 
+#define _DEFAULT_SOURCE
 #define _BSD_SOURCE /* For setgroups */
 
 #include "collectd.h"

diff --git a/src/liboconfig/oconfig.c b/src/liboconfig/oconfig.c
index 56ccefb..bb36c5e 100644 (file)
--- a/src/liboconfig/oconfig.c
+++ b/src/liboconfig/oconfig.c
@@ -45,8 +45,6 @@ oconfig_item_t *oconfig_parse_fh (FILE *fh)
   yyset_in (fh);
 
   if (NULL == c_file) {
-    int status;
-
     status = snprintf (file, sizeof (file), "<fd#%d>", fileno (fh));
 
     if ((status < 0) || (status >= sizeof (file))) {
@@ -188,7 +186,7 @@ oconfig_item_t *oconfig_clone (const oconfig_item_t *ci_orig)
   return (ci_copy);
 } /* oconfig_item_t *oconfig_clone */
 
-void oconfig_free_all (oconfig_item_t *ci)
+static void oconfig_free_all (oconfig_item_t *ci)
 {
   int i;
 

diff --git a/src/load.c b/src/load.c
index 0188da7..e0c09a3 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -21,6 +21,7 @@
  *   Manuel Sanmartin
  **/
 
+#define _DEFAULT_SOURCE
 #define _BSD_SOURCE
 
 #include "collectd.h"

diff --git a/src/logfile.c b/src/logfile.c
index 63448cb..a7cda3a 100644 (file)
--- a/src/logfile.c
+++ b/src/logfile.c
@@ -196,7 +196,7 @@ static int logfile_notification (const notification_t *n,
 
 #define APPEND(bufptr, buflen, key, value) \
        if ((buflen > 0) && (strlen (value) > 0)) { \
-               int status = ssnprintf (bufptr, buflen, ", %s = %s", key, value); \
+               status = ssnprintf (bufptr, buflen, ", %s = %s", key, value); \
                if (status > 0) { \
                        bufptr += status; \
                        buflen -= status; \

diff --git a/src/network.c b/src/network.c
index ae5ed09..0ee6ed0 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -22,6 +22,7 @@
  *   Aman Gupta <aman at tmm1.net>
  **/
 
+#define _DEFAULT_SOURCE
 #define _BSD_SOURCE /* For struct ip_mreq */
 
 #include "collectd.h"
@@ -2985,7 +2986,7 @@ static int network_config_set_ttl (const oconfig_item_t *ci) /* {{{ */
     network_config_ttl = tmp;
   else {
     WARNING ("network plugin: The `TimeToLive' must be between 1 and 255.");
-    return (-1);    
+    return (-1);
   }
 
   return (0);

diff --git a/src/notify_email.c b/src/notify_email.c
index 24c66ec..76d48d4 100644 (file)
--- a/src/notify_email.c
+++ b/src/notify_email.c
@@ -293,7 +293,6 @@ static int notify_email_notification (const notification_t *n,
 
   /* Initiate a connection to the SMTP server and transfer the message. */
   if (!smtp_start_session (session)) {
-    char buf[MAXSTRING];
     ERROR ("notify_email plugin: SMTP server problem: %s",
         smtp_strerror (smtp_errno (), buf, sizeof buf));
     pthread_mutex_unlock (&session_lock);

diff --git a/src/ntpd.c b/src/ntpd.c
index f192a82..67fff22 100644 (file)
--- a/src/ntpd.c
+++ b/src/ntpd.c
@@ -19,6 +19,7 @@
  *   Florian octo Forster <octo at collectd.org>
  **/
 
+#define _DEFAULT_SOURCE
 #define _BSD_SOURCE /* For NI_MAXHOST */
 
 #include "collectd.h"
@@ -160,16 +161,16 @@ struct resp_pkt
 /* l_fp to double */
 #define M_LFPTOD(r_i, r_uf, d) \
        do { \
-               register int32_t  i; \
-               register uint32_t f; \
+               register int32_t  ri; \
+               register uint32_t rf; \
                \
-               i = (r_i); \
-               f = (r_uf); \
-               if (i < 0) { \
-                       M_NEG(i, f); \
-                       (d) = -((double) i + ((double) f) / 4294967296.0); \
+               ri = (r_i); \
+               rf = (r_uf); \
+               if (ri < 0) { \
+                       M_NEG(ri, rf); \
+                       (d) = -((double) ri + ((double) rf) / 4294967296.0); \
                } else { \
-                       (d) = (double) i + ((double) f) / 4294967296.0; \
+                       (d) = (double) ri + ((double) rf) / 4294967296.0; \
                } \
        } while (0)
 
@@ -481,7 +482,7 @@ static int ntpd_receive_response (int *res_items, int *res_size,
                poll_s.fd      = sd;
                poll_s.events  = POLLIN | POLLPRI;
                poll_s.revents = 0;
-               
+
                DEBUG ("Polling for %ims", timeout);
                status = poll (&poll_s, 1, timeout);
 
@@ -521,7 +522,7 @@ static int ntpd_receive_response (int *res_items, int *res_size,
 
                DEBUG ("recv'd %i bytes", status);
 
-               /* 
+               /*
                 * Do some sanity checks first
                 */
                if (status < RESP_HEADER_SIZE)
@@ -730,7 +731,7 @@ static int ntpd_send_request (int req_code, int req_items, int req_size, char *r
 
        req.err_nitems   = ERR_NITEMS (0, req_items);
        req.mbz_itemsize = MBZ_ITEMSIZE (req_size);
-       
+
        if (req_data != NULL)
                memcpy ((void *) req.data, (const void *) req_data, req_data_len);
 

diff --git a/src/perl.c b/src/perl.c
index d247dc0..945e225 100644 (file)
--- a/src/perl.c
+++ b/src/perl.c
@@ -2079,7 +2079,7 @@ static int perl_shutdown (void)
                return 0;
 
        if (NULL == aTHX) {
-               c_ithread_t *t = NULL;
+               t = NULL;
 
                pthread_mutex_lock (&perl_threads->mutex);
                t = c_ithread_create (perl_threads->head->interp);

diff --git a/src/plugin.c b/src/plugin.c
index 6d3d3c9..73ec77a 100644 (file)
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -870,7 +870,7 @@ static int plugin_mark_loaded (char const *name)
        return (status);
 }
 
-static void plugin_free_loaded ()
+static void plugin_free_loaded (void)
 {
        void *key;
        void *value;
@@ -1458,7 +1458,6 @@ int plugin_unregister_notification (const char *name)
 void plugin_init_all (void)
 {
        char const *chain_name;
-       long write_threads_num;
        llentry_t *le;
        int status;
 

diff --git a/src/plugin.h b/src/plugin.h
index 8f0c6d8..d54db4b 100644 (file)
--- a/src/plugin.h
+++ b/src/plugin.h
@@ -399,4 +399,10 @@ cdtime_t plugin_get_interval (void);
 int plugin_thread_create (pthread_t *thread, const pthread_attr_t *attr,
                void *(*start_routine) (void *), void *arg);
 
+/*
+ * Plugins need to implement this
+ */
+
+void module_register (void);
+
 #endif /* PLUGIN_H */

diff --git a/src/processes.c b/src/processes.c
index c516208..89e663a 100644 (file)
--- a/src/processes.c
+++ b/src/processes.c
@@ -922,7 +922,7 @@ static procstat_t *ps_read_io (long pid, procstat_t *ps)
        return (ps);
 } /* procstat_t *ps_read_io */
 
-int ps_read_process (long pid, procstat_t *ps, char *state)
+static int ps_read_process (long pid, procstat_t *ps, char *state)
 {
        char  filename[64];
        char  buffer[1024];
@@ -1165,7 +1165,7 @@ static char *ps_get_cmdline (long pid, char *name, char *buf, size_t buf_len)
        return buf;
 } /* char *ps_get_cmdline (...) */
 
-static int read_fork_rate ()
+static int read_fork_rate (void)
 {
        FILE *proc_stat;
        char buffer[1024];

diff --git a/src/python.c b/src/python.c
index 44292f9..110a8e0 100644 (file)
--- a/src/python.c
+++ b/src/python.c
@@ -386,7 +386,7 @@ static int cpy_write_callback(const data_set_t *ds, const value_list_t *value_li
                }
                dict = PyDict_New();  /* New reference. */
                if (value_list->meta) {
-                       int i, num;
+                       int num;
                        char **table;
                        meta_data_t *meta = value_list->meta;
 
@@ -1017,7 +1017,7 @@ PyMODINIT_FUNC PyInit_collectd(void) {
 }
 #endif
 
-static int cpy_init_python() {
+static int cpy_init_python(void) {
        char *argv = "";
        PyObject *sys;
        PyObject *module;

diff --git a/src/sensors.c b/src/sensors.c
index 209482e..37d335c 100644 (file)
--- a/src/sensors.c
+++ b/src/sensors.c
@@ -262,7 +262,7 @@ static int sensors_config (const char *key, const char *value)
        return (0);
 }
 
-void sensors_free_features (void)
+static void sensors_free_features (void)
 {
        featurelist_t *thisft;
        featurelist_t *nextft;

diff --git a/src/threshold.c b/src/threshold.c
index a70ec8a..c1af40b 100644 (file)
--- a/src/threshold.c
+++ b/src/threshold.c
@@ -958,7 +958,7 @@ static int ut_missing (const value_list_t *vl,
   return (0);
 } /* }}} int ut_missing */
 
-int ut_config (oconfig_item_t *ci)
+static int ut_config (oconfig_item_t *ci)
 { /* {{{ */
   int i;
   int status = 0;

diff --git a/src/tokyotyrant.c b/src/tokyotyrant.c
index 678a341..b618ae3 100644 (file)
--- a/src/tokyotyrant.c
+++ b/src/tokyotyrant.c
@@ -79,7 +79,7 @@ static int tt_config (const char *key, const char *value)
        return (0);
 }
 
-static void printerr()
+static void printerr (void)
 {
        int ecode = tcrdbecode(rdb);
        ERROR ("tokyotyrant plugin: error: %d, %s",

diff --git a/src/types_list.c b/src/types_list.c
index 887b43d..41bb403 100644 (file)
--- a/src/types_list.c
+++ b/src/types_list.c
@@ -24,6 +24,7 @@
 
 #include "plugin.h"
 #include "configfile.h"
+#include "types_list.h"
 
 static int parse_ds (data_source_t *dsrc, char *buf, size_t buf_len)
 {

diff --git a/src/utils_avltree.c b/src/utils_avltree.c
index 139d23a..a9b3862 100644 (file)
--- a/src/utils_avltree.c
+++ b/src/utils_avltree.c
@@ -241,7 +241,7 @@ static void rebalance (c_avl_tree_t *t, c_avl_node_t *n)
                {
                        assert (n->right != NULL);
                        b_bottom = BALANCE (n->right);
-                       assert ((b_bottom >= -1) || (b_bottom <= 1));
+                       assert ((b_bottom >= -1) && (b_bottom <= 1));
                        if (b_bottom == 1)
                                n = rotate_right_left (t, n);
                        else
@@ -251,7 +251,7 @@ static void rebalance (c_avl_tree_t *t, c_avl_node_t *n)
                {
                        assert (n->left != NULL);
                        b_bottom = BALANCE (n->left);
-                       assert ((b_bottom >= -1) || (b_bottom <= 1));
+                       assert ((b_bottom >= -1) && (b_bottom <= 1));
                        if (b_bottom == -1)
                                n = rotate_left_right (t, n);
                        else

diff --git a/src/utils_cache.c b/src/utils_cache.c
index 5598f68..8e91588 100644 (file)
--- a/src/utils_cache.c
+++ b/src/utils_cache.c
@@ -737,7 +737,6 @@ int uc_get_history_by_name (const char *name,
   if (ce->history_length < num_steps)
   {
     gauge_t *tmp;
-    size_t i;
 
     tmp = realloc (ce->history, sizeof (*ce->history)
        * num_steps * ce->values_num);

diff --git a/src/utils_cmd_flush.c b/src/utils_cmd_flush.c
index 9a59310..087fee3 100644 (file)
--- a/src/utils_cmd_flush.c
+++ b/src/utils_cmd_flush.c
@@ -25,6 +25,7 @@
 #include "common.h"
 #include "plugin.h"
 #include "utils_parse_option.h"
+#include "utils_cmd_flush.h"
 
 int handle_flush (FILE *fh, char *buffer)
 {

diff --git a/src/utils_cmd_getval.c b/src/utils_cmd_getval.c
index 657483b..8d214aa 100644 (file)
--- a/src/utils_cmd_getval.c
+++ b/src/utils_cmd_getval.c
@@ -25,6 +25,7 @@
 
 #include "utils_cache.h"
 #include "utils_parse_option.h"
+#include "utils_cmd_getval.h"
 
 #define print_to_socket(fh, ...) \
   do { \

diff --git a/src/utils_cmd_putnotif.c b/src/utils_cmd_putnotif.c
index bed8462..ec91419 100644 (file)
--- a/src/utils_cmd_putnotif.c
+++ b/src/utils_cmd_putnotif.c
@@ -24,6 +24,7 @@
 #include "plugin.h"
 
 #include "utils_parse_option.h"
+#include "utils_cmd_putnotif.h"
 
 #define print_to_socket(fh, ...) \
   do { \

diff --git a/src/utils_cmd_putval.c b/src/utils_cmd_putval.c
index c9bf48b..a0d20c5 100644 (file)
--- a/src/utils_cmd_putval.c
+++ b/src/utils_cmd_putval.c
@@ -24,6 +24,7 @@
 #include "plugin.h"
 
 #include "utils_parse_option.h"
+#include "utils_cmd_putval.h"
 
 #define print_to_socket(fh, ...) \
     do { \

diff --git a/src/utils_db_query.c b/src/utils_db_query.c
index e8d7b3a..6b3c056 100644 (file)
--- a/src/utils_db_query.c
+++ b/src/utils_db_query.c
@@ -543,7 +543,7 @@ static int udb_result_create (const char *query_name, /* {{{ */
 /*
  * Query private functions
  */
-void udb_query_free_one (udb_query_t *q) /* {{{ */
+static void udb_query_free_one (udb_query_t *q) /* {{{ */
 {
   if (q == NULL)
     return;

diff --git a/src/utils_dns.c b/src/utils_dns.c
index fcc65a5..2b40676 100644 (file)
--- a/src/utils_dns.c
+++ b/src/utils_dns.c
@@ -3,10 +3,10 @@
  * Modifications Copyright (C) 2006  Florian octo Forster
  * Copyright (C) 2002  The Measurement Factory, Inc.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
@@ -33,6 +33,7 @@
  *   Florian octo Forster <octo at verplant.org>
  */
 
+#define _DEFAULT_SOURCE
 #define _BSD_SOURCE
 
 #include "collectd.h"

diff --git a/src/utils_latency.c b/src/utils_latency.c
index 9047974..efca6d2 100644 (file)
--- a/src/utils_latency.c
+++ b/src/utils_latency.c
@@ -24,14 +24,14 @@
  *   Florian Forster <ff at octo.it>
  **/
 
+#include <math.h>
+#include <limits.h>
+
 #include "collectd.h"
 #include "plugin.h"
 #include "utils_latency.h"
 #include "common.h"
 
-#include <math.h>
-#include <limits.h>
-
 #ifndef LLONG_MAX
 # define LLONG_MAX 9223372036854775807LL
 #endif
@@ -76,7 +76,7 @@ struct latency_counter_s
 * So, if the required bin width is 300, then new bin width will be 512 as it is
 * the next nearest power of 2.
 */
-void change_bin_width (latency_counter_t *lc, cdtime_t latency) /* {{{ */
+static void change_bin_width (latency_counter_t *lc, cdtime_t latency) /* {{{ */
 {
   /* This function is called because the new value is above histogram's range.
    * First find the required bin width:
@@ -117,7 +117,7 @@ void change_bin_width (latency_counter_t *lc, cdtime_t latency) /* {{{ */
       CDTIME_T_TO_DOUBLE (new_bin_width));
 } /* }}} void change_bin_width */
 
-latency_counter_t *latency_counter_create () /* {{{ */
+latency_counter_t *latency_counter_create (void) /* {{{ */
 {
   latency_counter_t *lc;
 

diff --git a/src/utils_latency.h b/src/utils_latency.h
index 3787c77..e7c2fc3 100644 (file)
--- a/src/utils_latency.h
+++ b/src/utils_latency.h
@@ -30,7 +30,7 @@
 struct latency_counter_s;
 typedef struct latency_counter_s latency_counter_t;
 
-latency_counter_t *latency_counter_create ();
+latency_counter_t *latency_counter_create (void);
 void latency_counter_destroy (latency_counter_t *lc);
 
 void latency_counter_add (latency_counter_t *lc, cdtime_t latency);

diff --git a/src/utils_random.c b/src/utils_random.c
index b873845..548d1d8 100644 (file)
--- a/src/utils_random.c
+++ b/src/utils_random.c
@@ -24,10 +24,12 @@
  *   Florian Forster <octo at collectd.org>
  **/
 
+#include <pthread.h>
+
 #include "collectd.h"
 #include "utils_time.h"
+#include "utils_random.h"
 
-#include <pthread.h>
 
 static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
 static _Bool have_seed = 0;

diff --git a/src/utils_subst.c b/src/utils_subst.c
index a49f6db..ca1e933 100644 (file)
--- a/src/utils_subst.c
+++ b/src/utils_subst.c
@@ -25,6 +25,7 @@
 
 #include "collectd.h"
 #include "common.h"
+#include "utils_subst.h"
 
 char *subst (char *buf, size_t buflen, const char *string, int off1, int off2,
                const char *replacement)

diff --git a/src/xmms.c b/src/xmms.c
index 52beb65..51f80d9 100644 (file)
--- a/src/xmms.c
+++ b/src/xmms.c
@@ -43,7 +43,7 @@ static void cxmms_submit (const char *type, gauge_t value)
        plugin_dispatch_values (&vl);
 } /* void cxmms_submit */
 
-int cxmms_read (void)
+static int cxmms_read (void)
 {
   gint rate;
   gint freq;

diff --git a/src/zfs_arc.c b/src/zfs_arc.c
index 3a54ad8..65a50b4 100644 (file)
--- a/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@ -171,8 +171,11 @@ static int za_read (void)
        za_read_derive (ksp, "deleted",  "cache_operation", "deleted");
 #if __FreeBSD__
        za_read_derive (ksp, "allocated","cache_operation", "allocated");
+#if defined(__FreeBSD_version) && (__FreeBSD_version < 1002501)
+       /* stolen removed from sysctl kstat.zfs.misc.arcstats on FreeBSD 10.2+ */
        za_read_derive (ksp, "stolen",   "cache_operation", "stolen");
 #endif
+#endif
 
        /* Issue indicators */
        za_read_derive (ksp, "mutex_miss", "mutex_operations", "miss");