X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Fcollectd.c;h=78d410cadb8214dcb6315f2e257ef8dbc9b6a189;hb=master;hp=a462005327956751c8d65512d97b8a07560bf310;hpb=015dde5b3b58fd45d2bcf0d5120b6858ff2c8100;p=collectd.git diff --git a/src/daemon/collectd.c b/src/daemon/collectd.c index a4620053..78d410ca 100644 --- a/src/daemon/collectd.c +++ b/src/daemon/collectd.c @@ -307,11 +307,12 @@ static int do_shutdown(void) { static void read_cmdline(int argc, char **argv, struct cmdline_config *config) { /* read options */ while (1) { - int c = getopt(argc, argv, "BhtTC:" + int c = getopt(argc, argv, + "BhtTC:" #if COLLECT_DAEMON - "fP:" + "fP:" #endif - ); + ); if (c == -1) break; @@ -357,7 +358,7 @@ static int configure_collectd(struct cmdline_config *config) { * Also, this will automatically load modules. */ if (cf_read(config->configfile)) { - fprintf(stderr, "Error: Reading the config file failed!\n"); + fprintf(stderr, "Error: Parsing the config file failed!\n"); return 1; } @@ -391,7 +392,9 @@ void stop_collectd(void) { loop++; } struct cmdline_config init_config(int argc, char **argv) { struct cmdline_config config = { - .daemonize = true, .create_basedir = true, .configfile = CONFIGFILE, + .daemonize = true, + .create_basedir = true, + .configfile = CONFIGFILE, }; read_cmdline(argc, argv, &config);