Remove database.h

[rrdd] / main.c

diff --git a/main.c b/main.c
index 76588c94db9e72a6674180c5842fd4b75f91dc32..49adc285414610d5c9ba2962ec52b80871262059 100644 (file)
--- a/main.c
+++ b/main.c
@@ -8,13 +8,11 @@
 #include "parser.h"
 #include "debug.h"
 
-#include "database.h"
 #include "config.h"
 
 struct user_options {
        int max_jobs;
        char *config_file;
-       int dump_defaults;
 };
 
 int read_args(int argc, char *argv[], struct user_options *opts)
@@ -23,10 +21,9 @@ int read_args(int argc, char *argv[], struct user_options *opts)
        static struct option long_options[] = {
                { .val = 'j', .has_arg = 1, .name = "jobs", },
                { .val = 'c', .has_arg = 1, .name = "config", },
-               { .val = 'd', .has_arg = 1, .name = "dump-default", },
                { },
        };
-       char short_options[] = "j:c:d:";
+       char short_options[] = "j:c:";
 
        while (1) {
                c = getopt_long(argc, argv, short_options, long_options,
@@ -44,11 +41,6 @@ int read_args(int argc, char *argv[], struct user_options *opts)
                        opts->config_file = optarg;
                        break;
 
-               case 'd':
-                       opts->dump_defaults = 1;
-                       opts->config_file = optarg;
-                       break;
-
                case '?':
                        return -1;
                }
@@ -68,15 +60,13 @@ int main(int argc, char *argv[])
        if (read_args(argc, argv, &opts) < 0)
                return -1;
 
-       if (opts.dump_defaults) {
-               ret = write_database(opts.config_file, default_rrds);
-               return 0;
+
+       if (!opts.config_file) {
+               pr_err("No database config file given. Nothing to do\n");
+               return 1;
        }
 
-       if (opts.config_file)
-               db_list = populate_database(opts.config_file);
-       else
-               db_list = default_rrds;
+       db_list = populate_database(opts.config_file);
 
        if (ret || !db_list)
                return 1;