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 bd18021dcf15c6301da656e700ff4b417fbe8612..b89ef8ecd73eebd8096cef500a09259bbc4f8564 100644 (file)
--- 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 61d922252ff213240976460784e7714f72a93bac..c0e3f587658882534bcc47ad8b013afe977d6f29 100644 (file)
--- 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 1550135c851249dc37f8a994fe4ff03d0f96ad48..3e6732f9a6d9bcfa0b5355fff9f5159e9b24eedb 100644 (file)
--- 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*[] */