replace 'IMAP_COMMAND' with 'struct ImapCommand'

diff --git a/imap/command.c b/imap/command.c
index 67eaf092cef9b92932543517d3800f998535836f..046ed3ed426fbf2cb09bf59d97e5f232fc85909b 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -47,9 +47,9 @@ static bool cmd_queue_full(IMAP_DATA *idata)
 
 /* sets up a new command control block and adds it to the queue.
  * Returns NULL if the pipeline is full. */
-static IMAP_COMMAND *cmd_new(IMAP_DATA *idata)
+static struct ImapCommand *cmd_new(IMAP_DATA *idata)
 {
-  IMAP_COMMAND *cmd = NULL;
+  struct ImapCommand *cmd = NULL;
 
   if (cmd_queue_full(idata))
   {
@@ -72,7 +72,7 @@ static IMAP_COMMAND *cmd_new(IMAP_DATA *idata)
 /* queues command. If the queue is full, attempts to drain it. */
 static int cmd_queue(IMAP_DATA *idata, const char *cmdstr)
 {
-  IMAP_COMMAND *cmd = NULL;
+  struct ImapCommand *cmd = NULL;
   int rc;
 
   if (cmd_queue_full(idata))
@@ -764,7 +764,7 @@ int imap_cmd_step(IMAP_DATA *idata)
   int c;
   int rc;
   int stillrunning = 0;
-  IMAP_COMMAND *cmd = NULL;
+  struct ImapCommand *cmd = NULL;
 
   if (idata->status == IMAP_FATAL)
   {

diff --git a/imap/imap.c b/imap/imap.c
index 5f9a18f36457dc1f18d49d3d32db4a7e451d5d9b..e872ffaea01431521c534415eaca368eb61a510f 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -492,7 +492,7 @@ void imap_close_connection(IMAP_DATA *idata)
     idata->state = IMAP_DISCONNECTED;
   }
   idata->seqno = idata->nextcmd = idata->lastcmd = idata->status = false;
-  memset(idata->cmds, 0, sizeof(IMAP_COMMAND) * idata->cmdslots);
+  memset(idata->cmds, 0, sizeof(struct ImapCommand) * idata->cmdslots);
 }
 
 /* imap_get_flags: Make a simple list out of a FLAGS response.

diff --git a/imap/imap_private.h b/imap/imap_private.h
index 3e84433702ca489997038b6918804bceb5e77cce..44ea060fdc49c4f187b5d4bfd91149b6759a86f5 100644 (file)
--- a/imap/imap_private.h
+++ b/imap/imap_private.h
@@ -38,7 +38,7 @@
 #define IMAP_LOG_LTRL 4
 #define IMAP_LOG_PASS 5
 
-/* IMAP command responses. Used in IMAP_COMMAND.state too */
+/* IMAP command responses. Used in ImapCommand.state too */
 /* <tag> OK ... */
 #define IMAP_CMD_OK       (0)
 /* <tag> BAD ... */
@@ -49,7 +49,7 @@
 #define IMAP_CMD_CONTINUE (1)
 /* + */
 #define IMAP_CMD_RESPOND  (2)
-/* IMAP_COMMAND.state additions */
+/* ImapCommand.state additions */
 #define IMAP_CMD_NEW      (3)
 
 /* number of entries in the hash table */
@@ -153,11 +153,11 @@ typedef struct
 } IMAP_LIST;
 
 /* IMAP command structure */
-typedef struct
+struct ImapCommand
 {
   char seq[SEQLEN + 1];
   int state;
-} IMAP_COMMAND;
+};
 
 typedef enum {
   IMAP_CT_NONE = 0,
@@ -197,7 +197,7 @@ typedef struct
   void *cmddata;
 
   /* command queue */
-  IMAP_COMMAND *cmds;
+  struct ImapCommand *cmds;
   int cmdslots;
   int nextcmd;
   int lastcmd;