X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Fcollectd.c;h=133b49ec9e0316622fb4073462e6ef452511b577;hb=61a4ed99b1a5b6d371bb745933d0efc5dff9505c;hp=727876bc2f0fd4fb11caa245c226cb42e25f4bdf;hpb=b755def9cec867d955ad91a3864e2dbca9a16bf1;p=collectd.git diff --git a/src/daemon/collectd.c b/src/daemon/collectd.c index 727876bc..133b49ec 100644 --- a/src/daemon/collectd.c +++ b/src/daemon/collectd.c @@ -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,14 +442,14 @@ 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; }; -void read_cmdline(int argc, char **argv, struct cmdline_config *config) { +static void read_cmdline(int argc, char **argv, struct cmdline_config *config) { /* read options */ while (1) { int c; @@ -496,7 +496,7 @@ void read_cmdline(int argc, char **argv, struct cmdline_config *config) { } /* while (1) */ } -int configure_collectd(struct cmdline_config *config) { +static int configure_collectd(struct cmdline_config *config) { const char *basedir; /* * Read options from the config file, the environment and the command @@ -555,8 +555,7 @@ int main(int argc, char **argv) { plugin_init_ctx(); - int status; - if ((status = configure_collectd(&config)) != 0) + if (configure_collectd(&config) != 0) exit(EXIT_FAILURE); #if COLLECT_DAEMON