From 8a2413d76ae16518eb38533494f1ce49aee4f7ed Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Tue, 5 Feb 2013 12:40:03 +0100 Subject: [PATCH] conf: remove unused CONF_DONE This flag was never used and is mostly useless, so remove it. Signed-off-by: David Herrmann --- src/conf.c | 5 ----- src/conf.h | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/conf.c b/src/conf.c index 8e34c9a..936e36f 100644 --- a/src/conf.c +++ b/src/conf.c @@ -265,7 +265,6 @@ int conf_ctx_parse_argv(struct conf_ctx *ctx, int argc, char **argv) } o->flags |= CONF_LOCKED; - o->flags |= CONF_DONE; break; } } else if (c < 200000) { @@ -279,7 +278,6 @@ int conf_ctx_parse_argv(struct conf_ctx *ctx, int argc, char **argv) } o->flags |= CONF_LOCKED; - o->flags |= CONF_DONE; } else { i = c - 200000; o = &ctx->opts[i]; @@ -291,7 +289,6 @@ int conf_ctx_parse_argv(struct conf_ctx *ctx, int argc, char **argv) } o->flags |= CONF_LOCKED; - o->flags |= CONF_DONE; } } @@ -355,7 +352,6 @@ static int parse_kv_pair(struct conf_option *opts, size_t len, ret = opt->file(opt, set, value); if (ret) return ret; - opt->flags |= CONF_DONE; return 0; } @@ -375,7 +371,6 @@ static int parse_kv_pair(struct conf_option *opts, size_t len, return ret; } - opt->flags |= CONF_DONE; return 0; } diff --git a/src/conf.h b/src/conf.h index 9824c9a..0f24ce4 100644 --- a/src/conf.h +++ b/src/conf.h @@ -151,8 +151,7 @@ int conf_ctx_parse_file(struct conf_ctx *ctx, const char *format, ...); * this structure. */ -#define CONF_DONE 0x0001 -#define CONF_LOCKED 0x0002 +#define CONF_LOCKED 0x0001 struct conf_option { unsigned int flags;