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 #2771 from rubenk/stdbool
[collectd.git]
/
src
/
daemon
/
collectd.c
diff --git
a/src/daemon/collectd.c
b/src/daemon/collectd.c
index
727876b
..
3b959c7
100644
(file)
--- 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 */
return 0;
} /* int init_global_variables */
-static int change_basedir(const char *orig_dir,
_B
ool create) {
+static int change_basedir(const char *orig_dir,
b
ool create) {
char *dir;
size_t dirlen;
int status;
char *dir;
size_t dirlen;
int status;
@@
-442,14
+442,14
@@
static int notify_systemd(void) {
#endif /* KERNEL_LINUX */
struct cmdline_config {
#endif /* KERNEL_LINUX */
struct cmdline_config {
-
_B
ool test_config;
-
_B
ool test_readall;
-
_B
ool create_basedir;
+
b
ool test_config;
+
b
ool test_readall;
+
b
ool create_basedir;
const char *configfile;
const char *configfile;
-
_B
ool daemonize;
+
b
ool 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;
/* read options */
while (1) {
int c;
@@
-464,19
+464,19
@@
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,7
+484,7
@@
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':
break;
#endif /* COLLECT_DAEMON */
case 'h':
@@
-496,7
+496,7
@@
void read_cmdline(int argc, char **argv, struct cmdline_config *config) {
} /* while (1) */
}
} /* 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
const char *basedir;
/*
* Read options from the config file, the environment and the command
@@
-542,7
+542,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);
@@
-555,8
+555,7
@@
int main(int argc, char **argv) {
plugin_init_ctx();
plugin_init_ctx();
- int status;
- if ((status = configure_collectd(&config)) != 0)
+ if (configure_collectd(&config) != 0)
exit(EXIT_FAILURE);
#if COLLECT_DAEMON
exit(EXIT_FAILURE);
#if COLLECT_DAEMON