imap: Add "cmd_" prefix to most imap_command_finished event parameters

Especially "name" can conflict with child events' parameter.

diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c
index 344eb252228c6cc98666001bb150a6bb748f0d65..59d0844d7670cbfddb426a409dc0d79be5b87f6c 100644 (file)
--- a/src/imap/imap-client.c
+++ b/src/imap/imap-client.c
@@ -731,12 +731,12 @@ bool client_read_args(struct client_command_context *cmd, unsigned int count,
                str = t_str_new(256);
                imap_write_args(str, *args_r);
                cmd->args = p_strdup(cmd->pool, str_c(str));
-               event_add_str(cmd->event, "args", cmd->args);
+               event_add_str(cmd->event, "cmd_args", cmd->args);
 
                str_truncate(str, 0);
                imap_write_args_for_human(str, *args_r);
                cmd->human_args = p_strdup(cmd->pool, str_c(str));
-               event_add_str(cmd->event, "human_args", cmd->human_args);
+               event_add_str(cmd->event, "cmd_human_args", cmd->human_args);
 
                cmd->client->input_lock = NULL;
                return TRUE;
@@ -895,8 +895,8 @@ struct client_command_context *client_command_alloc(struct client *client)
 
 void client_command_init_finished(struct client_command_context *cmd)
 {
-       event_add_str(cmd->event, "tag", cmd->tag);
-       event_add_str(cmd->event, "name", t_str_ucase(cmd->name));
+       event_add_str(cmd->event, "cmd_tag", cmd->tag);
+       event_add_str(cmd->event, "cmd_name", t_str_ucase(cmd->name));
 }
 
 static struct client_command_context *