projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2772 from rubenk/static-initializers
[collectd.git]
/
src
/
daemon
/
collectd.c
diff --git
a/src/daemon/collectd.c
b/src/daemon/collectd.c
index
133b49e
..
a656b37
100644
(file)
--- a/
src/daemon/collectd.c
+++ b/
src/daemon/collectd.c
@@
-51,7
+51,7
@@
#define COLLECTD_LOCALE "C"
#endif
#define COLLECTD_LOCALE "C"
#endif
-static int loop
= 0
;
+static int loop;
static void *do_flush(void __attribute__((unused)) * arg) {
INFO("Flushing all data.");
static void *do_flush(void __attribute__((unused)) * arg) {
INFO("Flushing all data.");
@@
-464,19
+464,19
@@
static void read_cmdline(int argc, char **argv, struct cmdline_config *config) {
switch (c) {
case 'B':
switch (c) {
case 'B':
- config->create_basedir =
0
;
+ config->create_basedir =
false
;
break;
case 'C':
config->configfile = optarg;
break;
case 't':
break;
case 'C':
config->configfile = optarg;
break;
case 't':
- config->test_config =
1
;
+ config->test_config =
true
;
break;
case 'T':
break;
case 'T':
- config->test_readall =
1
;
+ config->test_readall =
true
;
global_option_set("ReadThreads", "-1", 1);
#if COLLECT_DAEMON
global_option_set("ReadThreads", "-1", 1);
#if COLLECT_DAEMON
- config->daemonize =
0
;
+ config->daemonize =
false
;
#endif /* COLLECT_DAEMON */
break;
#if COLLECT_DAEMON
#endif /* COLLECT_DAEMON */
break;
#if COLLECT_DAEMON
@@
-484,12
+484,11
@@
static void read_cmdline(int argc, char **argv, struct cmdline_config *config) {
global_option_set("PIDFile", optarg, 1);
break;
case 'f':
global_option_set("PIDFile", optarg, 1);
break;
case 'f':
- config->daemonize =
0
;
+ config->daemonize =
false
;
break;
#endif /* COLLECT_DAEMON */
case 'h':
exit_usage(0);
break;
#endif /* COLLECT_DAEMON */
case 'h':
exit_usage(0);
- break;
default:
exit_usage(1);
} /* switch (c) */
default:
exit_usage(1);
} /* switch (c) */
@@
-542,7
+541,7
@@
int main(int argc, char **argv) {
int exit_status = 0;
struct cmdline_config config = {
int exit_status = 0;
struct cmdline_config config = {
- .daemonize =
1, .create_basedir = 1
, .configfile = CONFIGFILE,
+ .daemonize =
true, .create_basedir = true
, .configfile = CONFIGFILE,
};
read_cmdline(argc, argv, &config);
};
read_cmdline(argc, argv, &config);