projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.5'
[collectd.git]
/
src
/
daemon
/
common.h
diff --git
a/src/daemon/common.h
b/src/daemon/common.h
index
da21cad
..
6981d21
100644
(file)
--- a/
src/daemon/common.h
+++ b/
src/daemon/common.h
@@
-37,9
+37,7
@@
#define sfree(ptr) \
do { \
#define sfree(ptr) \
do { \
- if((ptr) != NULL) { \
- free(ptr); \
- } \
+ free(ptr); \
(ptr) = NULL; \
} while (0)
(ptr) = NULL; \
} while (0)
@@
-224,8
+222,6
@@
int escape_string (char *buffer, size_t buffer_size);
*/
void replace_special (char *buffer, size_t buffer_size);
*/
void replace_special (char *buffer, size_t buffer_size);
-int strsubstitute (char *str, char c_from, char c_to);
-
/*
* NAME
* strunescape
/*
* NAME
* strunescape
@@
-357,8
+353,8
@@
counter_t counter_diff (counter_t old_value, counter_t new_value);
int rate_to_value (value_t *ret_value, gauge_t rate,
rate_to_value_state_t *state, int ds_type, cdtime_t t);
int rate_to_value (value_t *ret_value, gauge_t rate,
rate_to_value_state_t *state, int ds_type, cdtime_t t);
-int value_to_rate (
value_t *ret_rate, derive_t value
,
- value_to_rate_state_t *state
, int ds_type, cdtime_t t
);
+int value_to_rate (
gauge_t *ret_rate, value_t value, int ds_type, cdtime_t t
,
+ value_to_rate_state_t *state);
/* Converts a service name (a string) to a port number
* (in the range [1-65535]). Returns less than zero on error. */
/* Converts a service name (a string) to a port number
* (in the range [1-65535]). Returns less than zero on error. */