From 88d2905fe24039bd6f7667cb92c7343093f83c66 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 15 Sep 2011 23:21:56 +0200 Subject: [PATCH] removed unfinished stuff --- bin/logger/src/options.c | 7 ++----- bin/logger/src/vzlogger.c | 8 ++++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/bin/logger/src/options.c b/bin/logger/src/options.c index 19d9a21..cb790e9 100644 --- a/bin/logger/src/options.c +++ b/bin/logger/src/options.c @@ -40,7 +40,7 @@ extern meter_type_t meter_types[]; -const options_t opts = { /* setting default options */ +options_t opts = { /* setting default options */ "/etc/vzlogger.conf", /* config file */ 8080, /* port for local interface */ 0, /* verbosity level */ @@ -170,7 +170,6 @@ void parse_channels(char *filename, list_t *chans) { channel_t ch; meter_type_t *type; - meter_conn_t connection; /* parse tokens (required) */ memset(tokens, 0, 5); @@ -216,9 +215,7 @@ void parse_channels(char *filename, list_t *chans) { else { interval = 0; } - - /* connection */ - + /* options (optional) */ options = tokens[type->periodical ? 4 : 3]; diff --git a/bin/logger/src/vzlogger.c b/bin/logger/src/vzlogger.c index f62a53f..858e206 100644 --- a/bin/logger/src/vzlogger.c +++ b/bin/logger/src/vzlogger.c @@ -46,7 +46,7 @@ /* global variables */ list_t chans; -extern const options_t opts; +extern options_t opts; extern const char *long_options_descs[]; extern const struct option long_options[]; extern const meter_type_t meter_types[]; @@ -55,9 +55,9 @@ extern const meter_type_t meter_types[]; * Print available options and some other usefull information */ void usage(char *argv[]) { - char **desc = long_options_descs; - struct option *op = long_options; - meter_type_t *type = meter_types; + const char **desc = long_options_descs; + const struct option *op = long_options; + const meter_type_t *type = meter_types; printf("Usage: %s [options]\n\n", argv[0]); printf(" following options are available:\n");