-/* Command identities: must be kept in step with the list of command words
-and the list of expanded argument counts which follow. */
-
-enum { add_command, defer_command, deliver_command, elif_command, else_command,
- endif_command, finish_command, fail_command, freeze_command,
- headers_command, if_command, logfile_command, logwrite_command,
- mail_command, noerror_command, pipe_command, save_command, seen_command,
- testprint_command, unseen_command, vacation_command };
-
-static const char *command_list[] = {
- "add", "defer", "deliver", "elif", "else", "endif", "finish",
- "fail", "freeze", "headers", "if", "logfile", "logwrite", "mail",
- "noerror", "pipe", "save", "seen", "testprint", "unseen", "vacation"
+/* Command identities */
+
+enum { ADD_COMMAND, DEFER_COMMAND, DELIVER_COMMAND, ELIF_COMMAND, ELSE_COMMAND,
+ ENDIF_COMMAND, FINISH_COMMAND, FAIL_COMMAND, FREEZE_COMMAND,
+ HEADERS_COMMAND, IF_COMMAND, LOGFILE_COMMAND, LOGWRITE_COMMAND,
+ MAIL_COMMAND, NOERROR_COMMAND, PIPE_COMMAND, SAVE_COMMAND, SEEN_COMMAND,
+ TESTPRINT_COMMAND, UNSEEN_COMMAND, VACATION_COMMAND };
+
+static const char * command_list[] = {
+ [ADD_COMMAND] = "add",
+ [DEFER_COMMAND] = "defer",
+ [DELIVER_COMMAND] = "deliver",
+ [ELIF_COMMAND] = "elif",
+ [ELSE_COMMAND] = "else",
+ [ENDIF_COMMAND] = "endif",
+ [FINISH_COMMAND] = "finish",
+ [FAIL_COMMAND] = "fail",
+ [FREEZE_COMMAND] = "freeze",
+ [HEADERS_COMMAND] = "headers",
+ [IF_COMMAND] = "if",
+ [LOGFILE_COMMAND] = "logfile",
+ [LOGWRITE_COMMAND] = "logwrite",
+ [MAIL_COMMAND] = "mail",
+ [NOERROR_COMMAND] = "noerror",
+ [PIPE_COMMAND] = "pipe",
+ [SAVE_COMMAND] = "save",
+ [SEEN_COMMAND] = "seen",
+ [TESTPRINT_COMMAND] = "testprint",
+ [UNSEEN_COMMAND] = "unseen",
+ [VACATION_COMMAND] = "vacation"