From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 19 Feb 2016 14:34:53 +0000 (+0200)
Subject: doveadm: Remove CMD_PARAM_NONE type, since it already defaulted to same as CMD_PARAM_BOOL
X-Git-Tag: 2.2.22.rc1~142
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05128fda80748e107bccdece0a3d23551e99e8f3;p=thirdparty%2Fdovecot%2Fcore.git

doveadm: Remove CMD_PARAM_NONE type, since it already defaulted to same as CMD_PARAM_BOOL
---

diff --git a/src/doveadm/client-connection-http.c b/src/doveadm/client-connection-http.c
index bd18021dcf..b89ef8ecd7 100644
--- a/src/doveadm/client-connection-http.c
+++ b/src/doveadm/client-connection-http.c
@@ -233,7 +233,6 @@ static int doveadm_http_server_json_parse_next(struct client_connection_http *co
 		} else {
 			conn->cmd_param->value_set = TRUE;
 			switch(conn->cmd_param->type) {
-				case CMD_PARAM_NONE:
 				case CMD_PARAM_BOOL:
 					conn->cmd_param->value.v_bool = (strcmp(*value,"true")==0); break;
 				case CMD_PARAM_INT64:
@@ -523,7 +522,6 @@ doveadm_http_server_send_api(struct client_connection_http *conn)
 			o_stream_nsend_str(conn->client.output, str_c(tmp));
 			o_stream_nsend_str(conn->client.output, "\",\"type\":\"");
 			switch(par->type) {
-			case CMD_PARAM_NONE:
 			case CMD_PARAM_BOOL:
 				o_stream_nsend_str(conn->client.output, "boolean");
 				break;
diff --git a/src/doveadm/doveadm-cmd.c b/src/doveadm/doveadm-cmd.c
index 61d922252f..c0e3f58765 100644
--- a/src/doveadm/doveadm-cmd.c
+++ b/src/doveadm/doveadm-cmd.c
@@ -187,7 +187,7 @@ bool doveadm_cmd_param_bool(int argc, const struct doveadm_cmd_param* params, co
 	const struct doveadm_cmd_param* param;
 	if ((param = doveadm_cmd_param_get(argc, params, name))==NULL) return FALSE;
 
-	if (param->type == CMD_PARAM_NONE || param->type == CMD_PARAM_BOOL) {
+	if (param->type == CMD_PARAM_BOOL) {
 		*value = param->value.v_bool;
 		return TRUE;
 	}
@@ -332,7 +332,6 @@ static void doveadm_fill_param(struct doveadm_cmd_param *param,
 {
 	param->value_set = TRUE;
 	switch(param->type) {
-	case CMD_PARAM_NONE:
 	case CMD_PARAM_BOOL:
 		param->value.v_bool = TRUE; break;
 	case CMD_PARAM_INT64:
diff --git a/src/doveadm/doveadm-cmd.h b/src/doveadm/doveadm-cmd.h
index 1550135c85..3e6732f9a6 100644
--- a/src/doveadm/doveadm-cmd.h
+++ b/src/doveadm/doveadm-cmd.h
@@ -3,7 +3,7 @@
 
 #define DOVEADM_CMD_PARAMS_START .parameters = (const struct doveadm_cmd_param[]){
 #define DOVEADM_CMD_PARAM(optP, nameP, typeP, flagP ) { .opt = optP, .name = nameP, .type = typeP, .flags = flagP },
-#define DOVEADM_CMD_PARAMS_END { .opt = NULL, .name = NULL, .type = CMD_PARAM_NONE, .flags = CMD_PARAM_FLAG_NONE } }
+#define DOVEADM_CMD_PARAMS_END { .opt = NULL, .name = NULL, .type = CMD_PARAM_BOOL, .flags = CMD_PARAM_FLAG_NONE } }
 
 struct doveadm_cmd_ver2;
 struct doveadm_mail_cmd_context;
@@ -11,8 +11,7 @@ struct doveadm_mail_cmd_context;
 typedef void doveadm_command_t(int argc, char *argv[]);
 
 typedef enum {
-	CMD_PARAM_NONE,    /* same as below, used for empty */
-	CMD_PARAM_BOOL,    /* value will contain 1 (not pointer) */
+	CMD_PARAM_BOOL = 0, /* value will contain 1 (not pointer) */
 	CMD_PARAM_INT64,    /* ditto but contains number (not pointer) */
 	CMD_PARAM_STR,     /* value contains const char* */
 	CMD_PARAM_ARRAY,   /* value contains const char*[] */