Mercurial > dovecot > original-hg > dovecot-1.2
diff src/imap/cmd-thread.c @ 8727:d2c357625ef2 HEAD
Avoid calling imap_parser_*() directly. It's not required.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Fri, 06 Feb 2009 13:10:06 -0500 |
| parents | bd2bb6ff0a83 |
| children | 20e6fa42d081 |
line wrap: on
line diff
--- a/src/imap/cmd-thread.c Fri Feb 06 12:49:46 2009 -0500 +++ b/src/imap/cmd-thread.c Fri Feb 06 13:10:06 2009 -0500 @@ -108,19 +108,11 @@ enum mail_thread_type thread_type; struct mail_search_args *sargs; const struct imap_arg *args; - int ret, args_count; const char *charset, *str; + int ret; - args_count = imap_parser_read_args(cmd->parser, 0, 0, &args); - if (args_count == -2) + if (!client_read_args(cmd, 0, 0, &args)) return FALSE; - client->input_lock = NULL; - - if (args_count < 3) { - client_send_command_error(cmd, args_count < 0 ? NULL : - "Missing or invalid arguments."); - return TRUE; - } if (!client_verify_open_mailbox(cmd)) return TRUE; @@ -140,8 +132,7 @@ /* charset */ if (args->type != IMAP_ARG_ATOM && args->type != IMAP_ARG_STRING) { - client_send_command_error(cmd, - "Invalid charset argument."); + client_send_command_error(cmd, "Invalid charset argument."); return TRUE; } charset = IMAP_ARG_STR(args);