Mercurial > dovecot > core-2.2
changeset 19770:7a5ab5070433
doveadm: Use ver2 structures for stop & reload.
| author | Aki Tuomi <aki.tuomi@dovecot.fi> |
|---|---|
| date | Fri, 19 Feb 2016 15:02:56 +0200 |
| parents | 9324bdd97612 |
| children | 7307f2716d6f |
| files | src/doveadm/doveadm-cmd.c src/doveadm/doveadm-cmd.h src/doveadm/doveadm-master.c |
| diffstat | 3 files changed, 17 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/doveadm/doveadm-cmd.c Fri Feb 19 14:58:41 2016 +0200 +++ b/src/doveadm/doveadm-cmd.c Fri Feb 19 15:02:56 2016 +0200 @@ -12,8 +12,6 @@ #include <getopt.h> static struct doveadm_cmd *doveadm_commands[] = { - &doveadm_cmd_stop, - &doveadm_cmd_reload, &doveadm_cmd_who, &doveadm_cmd_penalty, &doveadm_cmd_kick, @@ -24,6 +22,8 @@ }; static struct doveadm_cmd_ver2 *doveadm_commands_ver2[] = { + &doveadm_cmd_stop_ver2, + &doveadm_cmd_reload_ver2 }; ARRAY_TYPE(doveadm_cmd) doveadm_cmds;
--- a/src/doveadm/doveadm-cmd.h Fri Feb 19 14:58:41 2016 +0200 +++ b/src/doveadm/doveadm-cmd.h Fri Feb 19 15:02:56 2016 +0200 @@ -62,8 +62,6 @@ ARRAY_DEFINE_TYPE(doveadm_cmd, struct doveadm_cmd); extern ARRAY_TYPE(doveadm_cmd) doveadm_cmds; -extern struct doveadm_cmd doveadm_cmd_stop; -extern struct doveadm_cmd doveadm_cmd_reload; ARRAY_DEFINE_TYPE(doveadm_cmd_ver2, struct doveadm_cmd_ver2); extern ARRAY_TYPE(doveadm_cmd_ver2) doveadm_cmds_ver2; @@ -119,4 +117,7 @@ bool doveadm_cmd_param_array(int argc, struct doveadm_cmd_param* params, const char *name, ARRAY_TYPE(const_string)** value); bool doveadm_cmd_param_istream(int argc, struct doveadm_cmd_param* params, const char *name, struct istream** value); +extern struct doveadm_cmd_ver2 doveadm_cmd_stop_ver2; +extern struct doveadm_cmd_ver2 doveadm_cmd_reload_ver2; + #endif
--- a/src/doveadm/doveadm-master.c Fri Feb 19 14:58:41 2016 +0200 +++ b/src/doveadm/doveadm-master.c Fri Feb 19 15:02:56 2016 +0200 @@ -84,10 +84,18 @@ doveadm_master_send_signal(SIGHUP); } -struct doveadm_cmd doveadm_cmd_stop = { - cmd_stop, "stop", "" +struct doveadm_cmd_ver2 doveadm_cmd_stop_ver2 = { + .old_cmd = cmd_stop, + .name = "stop", + .usage = "", +DOVEADM_CMD_PARAMS_START +DOVEADM_CMD_PARAMS_END }; -struct doveadm_cmd doveadm_cmd_reload = { - cmd_reload, "reload", "" +struct doveadm_cmd_ver2 doveadm_cmd_reload_ver2 = { + .old_cmd = cmd_reload, + .name = "reload", + .usage = "", +DOVEADM_CMD_PARAMS_START +DOVEADM_CMD_PARAMS_END };