author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
Tue, 1 Mar 2016 11:47:25 +0000 (12:47 +0100) | ||
committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
Tue, 1 Mar 2016 11:47:25 +0000 (12:47 +0100) |
src/barometer.c | patch | blob | history | |
src/daemon/collectd.c | patch | blob | history | |
src/daemon/plugin.h | patch | blob | history | |
src/daemon/utils_cache.c | patch | blob | history | |
src/daemon/utils_cache.h | patch | blob | history | |
src/redis.c | patch | blob | history | |
src/write_riemann.c | patch | blob | history | |
src/write_riemann_threshold.c | patch | blob | history | |
src/write_riemann_threshold.h | [new file with mode: 0644] | patch | blob |
src/write_sensu.c | patch | blob | history |
diff --git a/src/barometer.c b/src/barometer.c
index d60f5881a7f94e00dd259f89cffcdf994b12eb07..0e8deaf82fca1685c8f368850b9eb0b2cea0759b 100644 (file)
--- a/src/barometer.c
+++ b/src/barometer.c
*
* @return detected sensor type
*/
-enum Sensor_type Detect_sensor_type(void)
+static enum Sensor_type detect_sensor_type(void)
{
if(BMP085_detect())
return Sensor_BMP085;
}
/* detect sensor type - this will also set slave address */
- sensor_type = Detect_sensor_type();
+ sensor_type = detect_sensor_type();
/* init correct sensor type */
switch(sensor_type)
diff --git a/src/daemon/collectd.c b/src/daemon/collectd.c
index 7b324e1e3a6513b47bf453e634c91bedfa831bea..a745d7d1ad367c93bf9d823f78298b68e0ccba93 100644 (file)
--- a/src/daemon/collectd.c
+++ b/src/daemon/collectd.c
#endif /* COLLECT_DAEMON */
#ifdef KERNEL_LINUX
-int notify_upstart (void)
+static int notify_upstart (void)
{
char const *upstart_job = getenv("UPSTART_JOB");
return 1;
}
-int notify_systemd (void)
+static int notify_systemd (void)
{
int fd;
const char *notifysocket;
diff --git a/src/daemon/plugin.h b/src/daemon/plugin.h
index 54cac78a257f853ce2a8f121d2ee62ff53717064..a63f5cdc6e5e189e0461cf982f117e6d48b55a0f 100644 (file)
--- a/src/daemon/plugin.h
+++ b/src/daemon/plugin.h
* Since some writers dynamically build their name it can be hard for
* the configuring person to know it. This function will fill this gap.
*/
-void plugin_log_available_writers ();
+void plugin_log_available_writers (void);
/*
* NAME
index e2c64261d34aa363aacb41c315fd152204397445..7054ae4fa9a9f83caba9b4a2e6d01c53e01d9a60 100644 (file)
--- a/src/daemon/utils_cache.c
+++ b/src/daemon/utils_cache.c
return (ret);
} /* gauge_t *uc_get_rate */
-size_t uc_get_size() {
+size_t uc_get_size (void) {
size_t size_arrays = 0;
pthread_mutex_lock (&cache_lock);
index ea3eb2f4db8342de2d85daef48271fe265024992..75bfc425a38c7c4624b89e8edf813a2433ca73fc 100644 (file)
--- a/src/daemon/utils_cache.h
+++ b/src/daemon/utils_cache.h
int uc_get_rate_by_name (const char *name, gauge_t **ret_values, size_t *ret_values_num);
gauge_t *uc_get_rate (const data_set_t *ds, const value_list_t *vl);
-size_t uc_get_size();
+size_t uc_get_size (void);
int uc_get_names (char ***ret_names, cdtime_t **ret_times, size_t *ret_number);
int uc_get_state (const data_set_t *ds, const value_list_t *vl);
diff --git a/src/redis.c b/src/redis.c
index 6fc37923b08b5df56aeb2d61485756042afde1eb..5bcc70350620d864badc2c67ad215c12e9f329ca 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
return (0);
} /* }}} int redis_init */
-int redis_handle_info (char *node, char const *info_line, char const *type, char const *type_instance, char const *field_name, int ds_type) /* {{{ */
+static int redis_handle_info (char *node, char const *info_line, char const *type, char const *type_instance, char const *field_name, int ds_type) /* {{{ */
{
char *str = strstr (info_line, field_name);
static char buf[MAX_REDIS_VAL_SIZE];
@@ -321,7 +321,7 @@ int redis_handle_info (char *node, char const *info_line, char const *type, char
} /* }}} int redis_handle_info */
-int redis_handle_query (redisContext *rh, redis_node_t *rn, redis_query_t *rq) /* {{{ */
+static int redis_handle_query (redisContext *rh, redis_node_t *rn, redis_query_t *rq) /* {{{ */
{
redisReply *rr;
const data_set_t *ds;
diff --git a/src/write_riemann.c b/src/write_riemann.c
index 5c59c92e4c50341c27fcb380188363685783d5d6..6a47ba3224cd52d6bbf5d75ca24cf73af6d55f41 100644 (file)
--- a/src/write_riemann.c
+++ b/src/write_riemann.c
* Florian octo Forster <octo at collectd.org>
*/
+#include <arpa/inet.h>
+#include <errno.h>
+#include <netdb.h>
+#include <inttypes.h>
+#include <pthread.h>
+
#include "collectd.h"
#include "plugin.h"
#include "common.h"
#include "configfile.h"
#include "utils_cache.h"
#include "riemann.pb-c.h"
-
-#include <arpa/inet.h>
-#include <errno.h>
-#include <netdb.h>
-#include <inttypes.h>
-#include <pthread.h>
+#include "write_riemann_threshold.h"
#define RIEMANN_HOST "localhost"
#define RIEMANN_PORT "5555"
#define RIEMANN_TTL_FACTOR 2.0
#define RIEMANN_BATCH_MAX 8192
-int write_riemann_threshold_check(const data_set_t *, const value_list_t *, int *);
-
struct riemann_host {
char *name;
char *event_service_prefix;
index f001ee5469a98fe7224c61d07b3a889f3ba5d148..85672882a096ef5b14ba6876b05df32ed620b3d1 100644 (file)
* Andrés J. Díaz <ajdiaz at connectical.com>
**/
+#include <assert.h>
+#include <ltdl.h>
+#include <pthread.h>
+
#include "collectd.h"
#include "common.h"
#include "plugin.h"
#include "utils_avltree.h"
#include "utils_cache.h"
#include "utils_threshold.h"
-
-#include <assert.h>
-#include <pthread.h>
+#include "write_riemann_threshold.h"
/*
* Threshold management
diff --git a/src/write_riemann_threshold.h b/src/write_riemann_threshold.h
--- /dev/null
@@ -0,0 +1,6 @@
+#ifndef WRITE_RIEMANN_THRESHOLD_H
+#define WRITE_RIEMANN_THRESHOLD_H
+
+int write_riemann_threshold_check(const data_set_t *, const value_list_t *, int *);
+
+#endif
diff --git a/src/write_sensu.c b/src/write_sensu.c
index b09dcc86424d7c3a0cbab39b5bea41c5d847c2f5..333993084166913ba8dbe559098c013b9a10eccf 100644 (file)
--- a/src/write_sensu.c
+++ b/src/write_sensu.c
#include <stdio.h>
#include <stdarg.h>
-int vasprintf(char **str, const char *fmt, va_list args) {
+static int vasprintf(char **str, const char *fmt, va_list args) {
int size = 0;
va_list tmpa;
// copy
return size;
}
-int asprintf(char **str, const char *fmt, ...) {
+static int asprintf(char **str, const char *fmt, ...) {
int size = 0;
va_list args;
// init variadic argumens
@@ -258,7 +258,7 @@ static char *build_json_str_list(const char *tag, struct str_list const *list) /
return ret_str;
} /* }}} char *build_json_str_list*/
-int sensu_format_name2(char *ret, int ret_len,
+static int sensu_format_name2(char *ret, int ret_len,
const char *hostname,
const char *plugin, const char *plugin_instance,
const char *type, const char *type_instance,
* http://creativeandcritical.net/str-replace-c/
* copyright (c) Laird Shaw, under public domain.
*/
-char *replace_str(const char *str, const char *old, /* {{{ */
+static char *replace_str(const char *str, const char *old, /* {{{ */
const char *new)
{
char *ret, *r;