Re: [PATCH 4/8] config: Improve variable 'type' handling.
On Sun, Feb 15, 2009 at 02:43:15PM +0200, Felipe Contreras wrote:
Show 21 quoted lines
> On Sun, Feb 15, 2009 at 2:24 PM, Johannes Schindelin
> <Johannes.Schindelin@gmx.de> wrote:
> > Hi,
> >
> > On Sun, 15 Feb 2009, Felipe Contreras wrote:
> >
> >> + switch (types) {
> >> + case TYPE_BOOL: type = T_BOOL; break;
> >> + case TYPE_INT: type = T_INT; break;
> >> + case TYPE_BOOL_OR_INT: type = T_BOOL_OR_INT; break;
> >> + default: break;
> >> + }
> >
> > Would it not be nicer to get rid of the variable named "type" and use
> > "types == TYPE_BOOL" and similar statements instead?
>
> I'm not too sure about that. If you read the code you might think you
> could actually have multiple types, but the same can be said about
> actions.
>
> Anyway, attached is a patch with that change.Sorry, again, but now inlined:
---
builtin-config.c | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/builtin-config.c b/builtin-config.c
index 084222a..30de93e 100644
--- a/builtin-config.c
+++ b/builtin-config.c
@@ -19,11 +19,10 @@ static int seen;
static char delim = '=';
static char key_delim = ' ';
static char term = '\n';
-static enum { T_RAW, T_INT, T_BOOL, T_BOOL_OR_INT } type = T_RAW;
static int use_global_config, use_system_config;
static const char *given_config_file;
-static int actions;
+static int actions, types;
static const char *get_color_slot, *get_colorbool_slot;
static int end_null;
@@ -39,6 +38,10 @@ static int end_null;
#define ACTION_LIST (1<<9)
#define ACTION_EDIT (1<<10)
+#define TYPE_BOOL (1<<0)
+#define TYPE_INT (1<<1)
+#define TYPE_BOOL_OR_INT (1<<2)
+
static struct option builtin_config_options[] = {
OPT_GROUP("Config file location"),
OPT_BOOLEAN(0, "global", &use_global_config, "use global config file"),
@@ -57,9 +60,9 @@ static struct option builtin_config_options[] = {
OPT_BIT('l', "list", &actions, "list all", ACTION_LIST),
OPT_BIT('e', "edit", &actions, "opens an editor", ACTION_EDIT),
OPT_GROUP("Type"),
- OPT_SET_INT(0, "bool", &type, "value is \"true\" or \"false\"", T_BOOL),
- OPT_SET_INT(0, "int", &type, "value is decimal number", T_INT),
- OPT_SET_INT(0, "bool-or-int", &type, NULL, T_BOOL_OR_INT),
+ OPT_BIT(0, "bool", &types, "value is \"true\" or \"false\"", TYPE_BOOL),
+ OPT_BIT(0, "int", &types, "value is decimal number", TYPE_INT),
+ OPT_BIT(0, "bool-or-int", &types, NULL, TYPE_BOOL_OR_INT),
OPT_STRING(0, "get-color", &get_color_slot, "slot", "find the color configured: [default]"),
OPT_STRING(0, "get-colorbool", &get_colorbool_slot, "slot", "find the color setting: [stdout-is-tty]"),
OPT_GROUP("Other"),
@@ -105,11 +108,11 @@ static int show_config(const char* key_, const char* value_, void *cb)
}
if (seen && !do_all)
dup_error = 1;
- if (type == T_INT)
+ if (types & TYPE_INT)
sprintf(value, "%d", git_config_int(key_, value_?value_:""));
- else if (type == T_BOOL)
+ else if (types & TYPE_BOOL)
vptr = git_config_bool(key_, value_) ? "true" : "false";
- else if (type == T_BOOL_OR_INT) {
+ else if (types & TYPE_BOOL_OR_INT) {
int is_bool, v;
v = git_config_bool_or_int(key_, value_, &is_bool);
if (is_bool)
@@ -208,18 +211,18 @@ static char *normalize_value(const char *key, const char *value)
if (!value)
return NULL;
- if (type == T_RAW)
+ if (types == 0)
normalized = xstrdup(value);
else {
normalized = xmalloc(64);
- if (type == T_INT) {
+ if (types & TYPE_INT) {
int v = git_config_int(key, value);
sprintf(normalized, "%d", v);
}
- else if (type == T_BOOL)
+ else if (types & TYPE_BOOL)
sprintf(normalized, "%s",
git_config_bool(key, value) ? "true" : "false");
- else if (type == T_BOOL_OR_INT) {
+ else if (types & TYPE_BOOL_OR_INT) {
int is_bool, v;
v = git_config_bool_or_int(key, value, &is_bool);
if (!is_bool)
@@ -336,6 +339,11 @@ int cmd_config(int argc, const char **argv, const char *unused_prefix)
key_delim = '\n';
}
+ if (HAS_MULTI_BITS(types)) {
+ error("only one type at a time.");
+ usage_with_options(builtin_config_usage, builtin_config_options);
+ }
+
if (HAS_MULTI_BITS(actions)) {
error("only one action at a time.");
usage_with_options(builtin_config_usage, builtin_config_options);
--
1.6.1.3
--
Felipe Contreras
Felipe Contreras <felipe.contreras@gmail.com>