X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fdaemon%2Fcollectd.c;h=a656b37dbb8a14f2873ca1d0582224ce27283a03;hp=e63c8466cc737a567715f1b21706a651388ad9f5;hb=a0412f28fc15eb04a9a630678a97b6bce2d71fb1;hpb=c3c9a56e37bac5d5be3b6beb0b33f89ea941295e diff --git a/src/daemon/collectd.c b/src/daemon/collectd.c index e63c8466..a656b37d 100644 --- a/src/daemon/collectd.c +++ b/src/daemon/collectd.c @@ -51,7 +51,7 @@ #define COLLECTD_LOCALE "C" #endif -static int loop = 0; +static int loop; static void *do_flush(void __attribute__((unused)) * arg) { INFO("Flushing all data."); @@ -156,7 +156,7 @@ static int init_global_variables(void) { return 0; } /* int init_global_variables */ -static int change_basedir(const char *orig_dir, _Bool create) { +static int change_basedir(const char *orig_dir, bool create) { char *dir; size_t dirlen; int status; @@ -442,11 +442,11 @@ static int notify_systemd(void) { #endif /* KERNEL_LINUX */ struct cmdline_config { - _Bool test_config; - _Bool test_readall; - _Bool create_basedir; + bool test_config; + bool test_readall; + bool create_basedir; const char *configfile; - _Bool daemonize; + bool daemonize; }; static void read_cmdline(int argc, char **argv, struct cmdline_config *config) { @@ -464,19 +464,19 @@ static void read_cmdline(int argc, char **argv, struct cmdline_config *config) { switch (c) { case 'B': - config->create_basedir = 0; + config->create_basedir = false; break; case 'C': config->configfile = optarg; break; case 't': - config->test_config = 1; + config->test_config = true; break; case 'T': - config->test_readall = 1; + config->test_readall = true; global_option_set("ReadThreads", "-1", 1); #if COLLECT_DAEMON - config->daemonize = 0; + config->daemonize = false; #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': - config->daemonize = 0; + config->daemonize = false; break; #endif /* COLLECT_DAEMON */ case 'h': exit_usage(0); - break; default: exit_usage(1); } /* switch (c) */ @@ -542,7 +541,7 @@ int main(int argc, char **argv) { 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);