projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/master'
[collectd.git]
/
src
/
collectd-nagios.c
diff --git
a/src/collectd-nagios.c
b/src/collectd-nagios.c
index
89f73b8
..
0629849
100644
(file)
--- a/
src/collectd-nagios.c
+++ b/
src/collectd-nagios.c
@@
-34,6
+34,7
@@
#include <assert.h>
#include <errno.h>
#include <assert.h>
#include <errno.h>
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-93,17
+94,17
@@
typedef struct range_s range_t;
extern char *optarg;
extern int optind, opterr, optopt;
extern char *optarg;
extern int optind, opterr, optopt;
-static char *socket_file_g
= NULL
;
-static char *value_string_g
= NULL
;
-static char *hostname_g
= NULL
;
+static char *socket_file_g;
+static char *value_string_g;
+static char *hostname_g;
static range_t range_critical_g;
static range_t range_warning_g;
static int consolitation_g = CON_NONE;
static range_t range_critical_g;
static range_t range_warning_g;
static int consolitation_g = CON_NONE;
-static
_Bool nan_is_error_g = 0
;
+static
bool nan_is_error_g
;
-static char **match_ds_g
= NULL
;
-static size_t match_ds_num_g
= 0
;
+static char **match_ds_g;
+static size_t match_ds_num_g;
/* `strdup' is an XSI extension. I don't want to pull in all of XSI just for
* that, so here's an own implementation.. It's easy enough. The GCC attributes
/* `strdup' is an XSI extension. I don't want to pull in all of XSI just for
* that, so here's an own implementation.. It's easy enough. The GCC attributes
@@
-115,7
+116,7
@@
cn_strdup(const char *str) /* {{{ */
char *ret;
strsize = strlen(str) + 1;
char *ret;
strsize = strlen(str) + 1;
- ret =
(char *)
malloc(strsize);
+ ret = malloc(strsize);
if (ret != NULL)
memcpy(ret, str, strsize);
return ret;
if (ret != NULL)
memcpy(ret, str, strsize);
return ret;
@@
-129,13
+130,13
@@
static int filter_ds(size_t *values_num, double **values,
if (match_ds_g == NULL)
return RET_OKAY;
if (match_ds_g == NULL)
return RET_OKAY;
- new_values =
(gauge_t *)
calloc(match_ds_num_g, sizeof(*new_values));
+ new_values = calloc(match_ds_num_g, sizeof(*new_values));
if (new_values == NULL) {
fprintf(stderr, "calloc failed: %s\n", strerror(errno));
return RET_UNKNOWN;
}
if (new_values == NULL) {
fprintf(stderr, "calloc failed: %s\n", strerror(errno));
return RET_UNKNOWN;
}
- new_names =
(char **)
calloc(match_ds_num_g, sizeof(*new_names));
+ new_names = calloc(match_ds_num_g, sizeof(*new_names));
if (new_names == NULL) {
fprintf(stderr, "calloc failed: %s\n", strerror(errno));
free(new_values);
if (new_names == NULL) {
fprintf(stderr, "calloc failed: %s\n", strerror(errno));
free(new_values);
@@
-526,7
+527,7
@@
static int do_check(lcc_connection_t *connection) {
int status;
snprintf(ident_str, sizeof(ident_str), "%s/%s", hostname_g, value_string_g);
int status;
snprintf(ident_str, sizeof(ident_str), "%s/%s", hostname_g, value_string_g);
- ident_str[sizeof(ident_str) - 1] =
0
;
+ ident_str[sizeof(ident_str) - 1] =
'\0'
;
status = lcc_string_to_identifier(connection, &ident, ident_str);
if (status != 0) {
status = lcc_string_to_identifier(connection, &ident, ident_str);
if (status != 0) {
@@
-637,7
+638,7
@@
int main(int argc, char **argv) {
break;
}
case 'm':
break;
}
case 'm':
- nan_is_error_g =
1
;
+ nan_is_error_g =
true
;
break;
default:
usage(argv[0]);
break;
default:
usage(argv[0]);
@@
-651,7
+652,7
@@
int main(int argc, char **argv) {
}
snprintf(address, sizeof(address), "unix:%s", socket_file_g);
}
snprintf(address, sizeof(address), "unix:%s", socket_file_g);
- address[sizeof(address) - 1] =
0
;
+ address[sizeof(address) - 1] =
'\0'
;
connection = NULL;
status = lcc_connect(address, &connection);
connection = NULL;
status = lcc_connect(address, &connection);