Andreas Krennmair:

	in a first run, remove some of the magic numbers in the POP code, and replace them by proper enums (more to come)

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@207 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/pop/pop.c b/pop/pop.c
index f39f023..9eb6172 100644 (file)
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -42,7 +42,8 @@ static int fetch_message (char *line, void *file)
 static int pop_read_header (POP_DATA * pop_data, HEADER * h)
 {
   FILE *f;
-  int ret, index;
+  int index;
+  pop_query_status ret;
   long length;
   char buf[LONG_STRING];
   char tempfile[_POSIX_PATH_MAX];
@@ -55,20 +56,20 @@ static int pop_read_header (POP_DATA * pop_data, HEADER * h)
 
   snprintf (buf, sizeof (buf), "LIST %d\r\n", h->refno);
   ret = pop_query (pop_data, buf, sizeof (buf));
-  if (ret == 0) {
+  if (ret == PQ_OK) {
     sscanf (buf, "+OK %d %ld", &index, &length);
 
     snprintf (buf, sizeof (buf), "TOP %d 0\r\n", h->refno);
     ret = pop_fetch_data (pop_data, buf, NULL, fetch_message, f);
 
     if (pop_data->cmd_top == 2) {
-      if (ret == 0) {
+      if (ret == PQ_OK) {
         pop_data->cmd_top = 1;
 
         dprint (1, (debugfile, "pop_read_header: set TOP capability\n"));
       }
 
-      if (ret == -2) {
+      if (ret == PQ_ERR) {
         pop_data->cmd_top = 0;
 
         dprint (1, (debugfile, "pop_read_header: unset TOP capability\n"));
@@ -79,7 +80,7 @@ static int pop_read_header (POP_DATA * pop_data, HEADER * h)
   }
 
   switch (ret) {
-  case 0:
+  case PQ_OK:
     {
       rewind (f);
       h->env = mutt_read_rfc822_header (f, h, 0, 0);
@@ -91,12 +92,12 @@ static int pop_read_header (POP_DATA * pop_data, HEADER * h)
       }
       break;
     }
-  case -2:
+  case PQ_ERR:
     {
       mutt_error ("%s", pop_data->err_msg);
       break;
     }
-  case -3:
+  case PFD_FUNCT_ERROR:
     {
       mutt_error _("Can't write header to temporary file!");
 
@@ -152,7 +153,8 @@ static int fetch_uidl (char *line, void *data)
  */
 static int pop_fetch_headers (CONTEXT * ctx)
 {
-  int i, ret, old_count, new_count;
+  int i, old_count, new_count;
+  pop_query_status ret;
   POP_DATA *pop_data = (POP_DATA *) ctx->data;
 
   time (&pop_data->check_time);
@@ -167,13 +169,13 @@ static int pop_fetch_headers (CONTEXT * ctx)
   ctx->msgcount = old_count;
 
   if (pop_data->cmd_uidl == 2) {
-    if (ret == 0) {
+    if (ret == PQ_OK) {
       pop_data->cmd_uidl = 1;
 
       dprint (1, (debugfile, "pop_fetch_headers: set UIDL capability\n"));
     }
 
-    if (ret == -2 && pop_data->cmd_uidl == 2) {
+    if (ret == PQ_ERR && pop_data->cmd_uidl == 2) {
       pop_data->cmd_uidl = 0;
 
       dprint (1, (debugfile, "pop_fetch_headers: unset UIDL capability\n"));
@@ -182,7 +184,7 @@ static int pop_fetch_headers (CONTEXT * ctx)
     }
   }
 
-  if (ret == 0) {
+  if (ret == PQ_OK) {
     for (i = 0; i < old_count; i++)
       if (ctx->hdrs[i]->refno == -1)
         ctx->hdrs[i]->deleted = 1;
@@ -192,7 +194,7 @@ static int pop_fetch_headers (CONTEXT * ctx)
                     i + 1 - old_count, new_count - old_count);
 
       ret = pop_read_header (pop_data, ctx->hdrs[i]);
-      if (ret < 0)
+      if (ret != PQ_OK)
         break;
 
       ctx->msgcount++;
@@ -202,7 +204,7 @@ static int pop_fetch_headers (CONTEXT * ctx)
       mx_update_context (ctx, i - old_count);
   }
 
-  if (ret < 0) {
+  if (ret != PQ_OK) {
     for (i = ctx->msgcount; i < new_count; i++)
       mutt_free_header (&ctx->hdrs[i]);
     return ret;
@@ -248,7 +250,7 @@ int pop_open_mailbox (CONTEXT * ctx)
   conn->data = pop_data;
 
   FOREVER {
-    if (pop_reconnect (ctx) < 0)
+    if (pop_reconnect (ctx) != PQ_OK)
       return -1;
 
     ctx->size = pop_data->size;
@@ -343,7 +345,7 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
   }
 
   FOREVER {
-    if (pop_reconnect (ctx) < 0)
+    if (pop_reconnect (ctx) != PQ_OK)
       return -1;
 
     /* verify that massage index is correct */
@@ -367,19 +369,19 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
     snprintf (buf, sizeof (buf), "RETR %d\r\n", h->refno);
 
     ret = pop_fetch_data (pop_data, buf, m, fetch_message, msg->fp);
-    if (ret == 0)
+    if (ret == PQ_OK)
       break;
 
     safe_fclose (&msg->fp);
     unlink (path);
 
-    if (ret == -2) {
+    if (ret == PQ_ERR) {
       mutt_error ("%s", pop_data->err_msg);
       mutt_sleep (2);
       return -1;
     }
 
-    if (ret == -3) {
+    if (ret == PFD_FUNCT_ERROR) {
       mutt_error _("Can't write message to temporary file!");
 
       mutt_sleep (2);
@@ -417,17 +419,18 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
 }
 
 /* update POP mailbox - delete messages from server */
-int pop_sync_mailbox (CONTEXT * ctx, int *index_hint)
+pop_query_status pop_sync_mailbox (CONTEXT * ctx, int *index_hint)
 {
-  int i, ret;
+  int i;
+  pop_query_status ret;
   char buf[LONG_STRING];
   POP_DATA *pop_data = (POP_DATA *) ctx->data;
 
   pop_data->check_time = 0;
 
   FOREVER {
-    if (pop_reconnect (ctx) < 0)
-      return -1;
+    if (pop_reconnect (ctx) != PQ_OK)
+      return PQ_NOT_CONNECTED;
 
     mutt_message (_("Marking %d messages deleted..."), ctx->deleted);
 
@@ -438,22 +441,22 @@ int pop_sync_mailbox (CONTEXT * ctx, int *index_hint)
       }
     }
 
-    if (ret == 0) {
+    if (ret == PQ_OK) {
       strfcpy (buf, "QUIT\r\n", sizeof (buf));
       ret = pop_query (pop_data, buf, sizeof (buf));
     }
 
-    if (ret == 0) {
+    if (ret == PQ_OK) {
       pop_data->clear_cache = 1;
       pop_clear_cache (pop_data);
       pop_data->status = POP_DISCONNECTED;
-      return 0;
+      return PQ_OK;
     }
 
-    if (ret == -2) {
+    if (ret == PQ_ERR) {
       mutt_error ("%s", pop_data->err_msg);
       mutt_sleep (2);
-      return -1;
+      return PQ_NOT_CONNECTED;
     }
   }
 }
@@ -496,7 +499,8 @@ void pop_fetch_mail (void)
   char buffer[LONG_STRING];
   char msgbuf[SHORT_STRING];
   char *url, *p;
-  int i, delanswer, last = 0, msgs, bytes, rset = 0, ret;
+  int i, delanswer, last = 0, msgs, bytes, rset = 0;
+  pop_query_status ret;
   CONNECTION *conn;
   CONTEXT ctx;
   MESSAGE *msg = NULL;
@@ -543,9 +547,9 @@ void pop_fetch_mail (void)
   /* find out how many messages are in the mailbox. */
   strfcpy (buffer, "STAT\r\n", sizeof (buffer));
   ret = pop_query (pop_data, buffer, sizeof (buffer));
-  if (ret == -1)
+  if (ret == PQ_NOT_CONNECTED)
     goto fail;
-  if (ret == -2) {
+  if (ret == PQ_ERR) {
     mutt_error ("%s", pop_data->err_msg);
     goto finish;
   }
@@ -556,9 +560,9 @@ void pop_fetch_mail (void)
   if (msgs > 0 && option (OPTPOPLAST)) {
     strfcpy (buffer, "LAST\r\n", sizeof (buffer));
     ret = pop_query (pop_data, buffer, sizeof (buffer));
-    if (ret == -1)
+    if (ret == PQ_NOT_CONNECTED)
       goto fail;
-    if (ret == 0)
+    if (ret == PQ_OK)
       sscanf (buffer, "+OK %d", &last);
   }
 
@@ -584,32 +588,32 @@ void pop_fetch_mail (void)
     else {
       snprintf (buffer, sizeof (buffer), "RETR %d\r\n", i);
       ret = pop_fetch_data (pop_data, buffer, NULL, fetch_message, msg->fp);
-      if (ret == -3)
+      if (ret == PFD_FUNCT_ERROR)
         rset = 1;
 
-      if (ret == 0 && mx_commit_message (msg, &ctx) != 0) {
+      if (ret == PQ_OK && mx_commit_message (msg, &ctx) != 0) {
         rset = 1;
-        ret = -3;
+        ret = PFD_FUNCT_ERROR;
       }
 
       mx_close_message (&msg);
     }
 
-    if (ret == 0 && delanswer == M_YES) {
+    if (ret == PQ_OK && delanswer == M_YES) {
       /* delete the message on the server */
       snprintf (buffer, sizeof (buffer), "DELE %d\r\n", i);
       ret = pop_query (pop_data, buffer, sizeof (buffer));
     }
 
-    if (ret == -1) {
+    if (ret == PQ_NOT_CONNECTED) {
       mx_close_mailbox (&ctx, NULL);
       goto fail;
     }
-    if (ret == -2) {
+    if (ret == PQ_ERR) {
       mutt_error ("%s", pop_data->err_msg);
       break;
     }
-    if (ret == -3) {
+    if (ret == -3) { /* this is -3 when ret != 0, because it will keep the value from before *gna* */
       mutt_error _("Error while writing mailbox!");
 
       break;
@@ -624,14 +628,14 @@ void pop_fetch_mail (void)
   if (rset) {
     /* make sure no messages get deleted */
     strfcpy (buffer, "RSET\r\n", sizeof (buffer));
-    if (pop_query (pop_data, buffer, sizeof (buffer)) == -1)
+    if (pop_query (pop_data, buffer, sizeof (buffer)) == PQ_NOT_CONNECTED)
       goto fail;
   }
 
 finish:
   /* exit gracefully */
   strfcpy (buffer, "QUIT\r\n", sizeof (buffer));
-  if (pop_query (pop_data, buffer, sizeof (buffer)) == -1)
+  if (pop_query (pop_data, buffer, sizeof (buffer)) == PQ_NOT_CONNECTED)
     goto fail;
   mutt_socket_close (conn);
   FREE (&pop_data);

diff --git a/pop/pop.h b/pop/pop.h
index 6adacc0..453d2ce 100644 (file)
--- a/pop/pop.h
+++ b/pop/pop.h
@@ -42,6 +42,19 @@ typedef struct {
   char *path;
 } POP_CACHE;
 
+typedef enum pop_query_status_e {
+  PFD_FUNCT_ERROR = -3, /* pop_fetch_data uses pop_query_status and this return value */
+  PQ_ERR = -2,
+  PQ_NOT_CONNECTED = -1,
+  PQ_OK = 0
+} pop_query_status;
+
+typedef enum cmd_user_status_e {
+  USER_NOT_AVAILABLE = 0,
+  USER_AVAILABLE,
+  USER_UNKNOWN
+} cmd_user_status;
+
 typedef struct {
   CONNECTION *conn;
   unsigned int status:2;
@@ -49,7 +62,7 @@ typedef struct {
   unsigned int use_stls:2;
   unsigned int cmd_capa:1;      /* optional command CAPA */
   unsigned int cmd_stls:1;      /* optional command STLS */
-  unsigned int cmd_user:2;      /* optional command USER */
+  cmd_user_status cmd_user;      /* optional command USER */
   unsigned int cmd_uidl:2;      /* optional command UIDL */
   unsigned int cmd_top:2;       /* optional command TOP */
   unsigned int resp_codes:1;    /* server supports extended response codes */
@@ -80,18 +93,18 @@ void pop_apop_timestamp (POP_DATA *, char *);
 #define pop_query(A,B,C) pop_query_d(A,B,C,NULL)
 int pop_parse_path (const char *, ACCOUNT *);
 int pop_connect (POP_DATA *);
-int pop_open_connection (POP_DATA *);
-int pop_query_d (POP_DATA *, char *, size_t, char *);
-int pop_fetch_data (POP_DATA *, char *, char *, int (*funct) (char *, void *),
+pop_query_status pop_open_connection (POP_DATA *);
+pop_query_status pop_query_d (POP_DATA *, char *, size_t, char *);
+pop_query_status pop_fetch_data (POP_DATA *, char *, char *, int (*funct) (char *, void *),
                     void *);
-int pop_reconnect (CONTEXT *);
+pop_query_status pop_reconnect (CONTEXT *);
 void pop_logout (CONTEXT *);
 void pop_error (POP_DATA *, char *);
 
 /* pop.c */
 int pop_check_mailbox (CONTEXT *, int *);
 int pop_open_mailbox (CONTEXT *);
-int pop_sync_mailbox (CONTEXT *, int *);
+pop_query_status pop_sync_mailbox (CONTEXT *, int *);
 int pop_fetch_message (MESSAGE *, CONTEXT *, int);
 void pop_close_mailbox (CONTEXT *);
 void pop_fetch_mail (void);

diff --git a/pop/pop_auth.c b/pop/pop_auth.c
index 2583e18..51cdeb0 100644 (file)
--- a/pop/pop_auth.c
+++ b/pop/pop_auth.c
@@ -161,7 +161,7 @@ bail:
   /* terminate SASL sessoin if the last responce is not +OK nor -ERR */
   if (!mutt_strncmp (inbuf, "+ ", 2)) {
     snprintf (buf, sizeof (buf), "*\r\n");
-    if (pop_query (pop_data, buf, sizeof (buf)) == -1)
+    if (pop_query (pop_data, buf, sizeof (buf)) == PQ_NOT_CONNECTED)
       return POP_A_SOCKET;
   }
 
@@ -216,9 +216,9 @@ static pop_auth_res_t pop_auth_apop (POP_DATA * pop_data, const char *method)
             hash);
 
   switch (pop_query (pop_data, buf, sizeof (buf))) {
-  case 0:
+  case PQ_OK:
     return POP_A_SUCCESS;
-  case -1:
+  case PQ_NOT_CONNECTED:
     return POP_A_SOCKET;
   }
 
@@ -233,9 +233,9 @@ static pop_auth_res_t pop_auth_apop (POP_DATA * pop_data, const char *method)
 static pop_auth_res_t pop_auth_user (POP_DATA * pop_data, const char *method)
 {
   char buf[LONG_STRING];
-  int ret;
+  pop_query_status ret;
 
-  if (!pop_data->cmd_user)
+  if (pop_data->cmd_user == USER_NOT_AVAILABLE)
     return POP_A_UNAVAIL;
 
   mutt_message _("Logging in...");
@@ -243,15 +243,15 @@ static pop_auth_res_t pop_auth_user (POP_DATA * pop_data, const char *method)
   snprintf (buf, sizeof (buf), "USER %s\r\n", pop_data->conn->account.user);
   ret = pop_query (pop_data, buf, sizeof (buf));
 
-  if (pop_data->cmd_user == 2) {
-    if (ret == 0) {
-      pop_data->cmd_user = 1;
+  if (pop_data->cmd_user == USER_UNKNOWN) {
+    if (ret == PQ_OK) {
+      pop_data->cmd_user = USER_AVAILABLE;
 
       dprint (1, (debugfile, "pop_auth_user: set USER capability\n"));
     }
 
-    if (ret == -2) {
-      pop_data->cmd_user = 0;
+    if (ret == PQ_ERR) {
+      pop_data->cmd_user = USER_NOT_AVAILABLE;
 
       dprint (1, (debugfile, "pop_auth_user: unset USER capability\n"));
       snprintf (pop_data->err_msg, sizeof (pop_data->err_msg),
@@ -259,7 +259,7 @@ static pop_auth_res_t pop_auth_user (POP_DATA * pop_data, const char *method)
     }
   }
 
-  if (ret == 0) {
+  if (ret == PQ_OK) {
     snprintf (buf, sizeof (buf), "PASS %s\r\n", pop_data->conn->account.pass);
     ret = pop_query_d (pop_data, buf, sizeof (buf),
 #ifdef DEBUG
@@ -270,9 +270,9 @@ static pop_auth_res_t pop_auth_user (POP_DATA * pop_data, const char *method)
   }
 
   switch (ret) {
-  case 0:
+  case PQ_OK:
     return POP_A_SUCCESS;
-  case -1:
+  case PQ_NOT_CONNECTED:
     return POP_A_SOCKET;
   }
 

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 6b814fa..3a86c6a 100644 (file)
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -125,7 +125,7 @@ static int fetch_auth (char *line, void *data)
  * -1 - conection lost,
  * -2 - execution error.
 */
-static int pop_capabilities (POP_DATA * pop_data, int mode)
+static pop_query_status pop_capabilities (POP_DATA * pop_data, int mode)
 {
   char buf[LONG_STRING];
 
@@ -150,13 +150,13 @@ static int pop_capabilities (POP_DATA * pop_data, int mode)
   if (mode == 0 || pop_data->cmd_capa) {
     strfcpy (buf, "CAPA\r\n", sizeof (buf));
     switch (pop_fetch_data (pop_data, buf, NULL, fetch_capa, pop_data)) {
-    case 0:
+    case PQ_OK:
       {
         pop_data->cmd_capa = 1;
         break;
       }
-    case -1:
-      return -1;
+    case PQ_NOT_CONNECTED:
+      return PQ_NOT_CONNECTED;
     }
   }
 
@@ -167,8 +167,8 @@ static int pop_capabilities (POP_DATA * pop_data, int mode)
     pop_data->cmd_top = 2;
 
     strfcpy (buf, "AUTH\r\n", sizeof (buf));
-    if (pop_fetch_data (pop_data, buf, NULL, fetch_auth, pop_data) == -1)
-      return -1;
+    if (pop_fetch_data (pop_data, buf, NULL, fetch_auth, pop_data) == PQ_NOT_CONNECTED)
+      return PQ_NOT_CONNECTED;
   }
 
   /* Check capabilities */
@@ -183,12 +183,12 @@ static int pop_capabilities (POP_DATA * pop_data, int mode)
       msg = _("Command UIDL is not supported by server.");
     if (msg && pop_data->cmd_capa) {
       mutt_error (msg);
-      return -2;
+      return PQ_ERR;
     }
     pop_data->capabilities = 1;
   }
 
-  return 0;
+  return PQ_OK;
 }
 
 /*
@@ -230,24 +230,24 @@ int pop_connect (POP_DATA * pop_data)
  * -2 - invalid command or execution error,
  * -3 - authentication canceled.
 */
-int pop_open_connection (POP_DATA * pop_data)
+pop_query_status pop_open_connection (POP_DATA * pop_data)
 {
-  int ret;
+  pop_query_status ret;
   unsigned int n, size;
   char buf[LONG_STRING];
 
   ret = pop_connect (pop_data);
-  if (ret < 0) {
+  if (ret != PQ_OK) {
     mutt_sleep (2);
     return ret;
   }
 
   ret = pop_capabilities (pop_data, 0);
-  if (ret == -1)
+  if (ret == PQ_NOT_CONNECTED)
     goto err_conn;
-  if (ret == -2) {
+  if (ret == PQ_ERR) {
     mutt_sleep (2);
-    return -2;
+    return PQ_ERR;
   }
 
 #if (defined(USE_SSL) || defined(USE_GNUTLS)) && !defined(USE_NSS)
@@ -257,7 +257,7 @@ int pop_open_connection (POP_DATA * pop_data)
       ret = query_quadoption (OPT_SSLSTARTTLS,
                               _("Secure connection with TLS?"));
       if (ret == -1)
-        return -2;
+        return PQ_ERR;
       pop_data->use_stls = 1;
       if (ret == M_YES)
         pop_data->use_stls = 2;
@@ -265,9 +265,9 @@ int pop_open_connection (POP_DATA * pop_data)
     if (pop_data->use_stls == 2) {
       strfcpy (buf, "STLS\r\n", sizeof (buf));
       ret = pop_query (pop_data, buf, sizeof (buf));
-      if (ret == -1)
+      if (ret == PQ_NOT_CONNECTED)
         goto err_conn;
-      if (ret != 0) {
+      if (ret != PQ_OK) {
         mutt_error ("%s", pop_data->err_msg);
         mutt_sleep (2);
       }
@@ -279,16 +279,16 @@ int pop_open_connection (POP_DATA * pop_data)
       {
         mutt_error (_("Could not negotiate TLS connection"));
         mutt_sleep (2);
-        return -2;
+        return PQ_ERR;
       }
       else {
         /* recheck capabilities after STLS completes */
         ret = pop_capabilities (pop_data, 1);
-        if (ret == -1)
+        if (ret == PQ_NOT_CONNECTED)
           goto err_conn;
-        if (ret == -2) {
+        if (ret == PQ_ERR) {
           mutt_sleep (2);
-          return -2;
+          return PQ_ERR;
         }
       }
     }
@@ -296,28 +296,28 @@ int pop_open_connection (POP_DATA * pop_data)
 #endif
 
   ret = pop_authenticate (pop_data);
-  if (ret == -1)
+  if (ret == PQ_NOT_CONNECTED)
     goto err_conn;
-  if (ret == -3)
+  if (ret == PFD_FUNCT_ERROR)
     mutt_clear_error ();
-  if (ret != 0)
+  if (ret != PQ_OK)
     return ret;
 
   /* recheck capabilities after authentication */
   ret = pop_capabilities (pop_data, 2);
-  if (ret == -1)
+  if (ret == PQ_NOT_CONNECTED)
     goto err_conn;
-  if (ret == -2) {
+  if (ret == PQ_ERR) {
     mutt_sleep (2);
-    return -2;
+    return PQ_ERR;
   }
 
   /* get total size of mailbox */
   strfcpy (buf, "STAT\r\n", sizeof (buf));
   ret = pop_query (pop_data, buf, sizeof (buf));
-  if (ret == -1)
+  if (ret == PQ_NOT_CONNECTED)
     goto err_conn;
-  if (ret == -2) {
+  if (ret == PQ_ERR) {
     mutt_error ("%s", pop_data->err_msg);
     mutt_sleep (2);
     return ret;
@@ -325,20 +325,20 @@ int pop_open_connection (POP_DATA * pop_data)
 
   sscanf (buf, "+OK %u %u", &n, &size);
   pop_data->size = size;
-  return 0;
+  return PQ_OK;
 
 err_conn:
   pop_data->status = POP_DISCONNECTED;
   mutt_error _("Server closed connection!");
 
   mutt_sleep (2);
-  return -1;
+  return PQ_NOT_CONNECTED;
 }
 
 /* logout from POP server */
 void pop_logout (CONTEXT * ctx)
 {
-  int ret = 0;
+  pop_query_status ret = 0;
   char buf[LONG_STRING];
   POP_DATA *pop_data = (POP_DATA *) ctx->data;
 
@@ -350,7 +350,7 @@ void pop_logout (CONTEXT * ctx)
       ret = pop_query (pop_data, buf, sizeof (buf));
     }
 
-    if (ret != -1) {
+    if (ret != PQ_NOT_CONNECTED) {
       strfcpy (buf, "QUIT\r\n", sizeof (buf));
       pop_query (pop_data, buf, sizeof (buf));
     }
@@ -368,13 +368,13 @@ void pop_logout (CONTEXT * ctx)
  * -1 - conection lost,
  * -2 - invalid command or execution error.
 */
-int pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, char *msg)
+pop_query_status pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, char *msg)
 {
   int dbg = M_SOCK_LOG_CMD;
   char *c;
 
   if (pop_data->status != POP_CONNECTED)
-    return -1;
+    return PQ_NOT_CONNECTED;
 
 #ifdef DEBUG
   /* print msg instaed of real command */
@@ -392,13 +392,13 @@ int pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, char *msg)
 
   if (mutt_socket_readln (buf, buflen, pop_data->conn) < 0) {
     pop_data->status = POP_DISCONNECTED;
-    return -1;
+    return PQ_NOT_CONNECTED;
   }
   if (!mutt_strncmp (buf, "+OK", 3))
-    return 0;
+    return PQ_OK;
 
   pop_error (pop_data, buf);
-  return -2;
+  return PQ_ERR;
 }
 
 /*
@@ -410,18 +410,19 @@ int pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, char *msg)
  * -2 - invalid command or execution error,
  * -3 - error in funct(*line, *data)
  */
-int pop_fetch_data (POP_DATA * pop_data, char *query, char *msg,
+pop_query_status pop_fetch_data (POP_DATA * pop_data, char *query, char *msg,
                     int (*funct) (char *, void *), void *data)
 {
   char buf[LONG_STRING];
   char *inbuf;
   char *p;
-  int ret, chunk, line = 0;
+  pop_query_status ret;
+  int chunk, line = 0;
   size_t lenbuf = 0;
 
   strfcpy (buf, query, sizeof (buf));
   ret = pop_query (pop_data, buf, sizeof (buf));
-  if (ret < 0)
+  if (ret != PQ_OK)
     return ret;
 
   inbuf = safe_malloc (sizeof (buf));
@@ -432,7 +433,7 @@ int pop_fetch_data (POP_DATA * pop_data, char *query, char *msg,
                             M_SOCK_LOG_HDR);
     if (chunk < 0) {
       pop_data->status = POP_DISCONNECTED;
-      ret = -1;
+      ret = PQ_NOT_CONNECTED;
       break;
     }
 
@@ -453,7 +454,7 @@ int pop_fetch_data (POP_DATA * pop_data, char *query, char *msg,
       if (msg && ReadInc && (line % ReadInc == 0))
         mutt_message ("%s %d", msg, line);
       if (ret == 0 && funct (inbuf, data) < 0)
-        ret = -3;
+        ret = PFD_FUNCT_ERROR;
       lenbuf = 0;
     }
 
@@ -483,21 +484,21 @@ static int check_uidl (char *line, void *data)
 }
 
 /* reconnect and verify idnexes if connection was lost */
-int pop_reconnect (CONTEXT * ctx)
+pop_query_status pop_reconnect (CONTEXT * ctx)
 {
-  int ret;
+  pop_query_status ret;
   POP_DATA *pop_data = (POP_DATA *) ctx->data;
 
   if (pop_data->status == POP_CONNECTED)
-    return 0;
+    return PQ_OK;
   if (pop_data->status == POP_BYE)
-    return -1;
+    return PQ_NOT_CONNECTED;
 
   FOREVER {
     mutt_socket_close (pop_data->conn);
 
     ret = pop_open_connection (pop_data);
-    if (ret == 0) {
+    if (ret == PQ_OK) {
       char *msg = _("Verifying message indexes...");
       int i;
 
@@ -507,22 +508,22 @@ int pop_reconnect (CONTEXT * ctx)
       mutt_message (msg);
 
       ret = pop_fetch_data (pop_data, "UIDL\r\n", msg, check_uidl, ctx);
-      if (ret == -2) {
+      if (ret == PQ_ERR) {
         mutt_error ("%s", pop_data->err_msg);
         mutt_sleep (2);
       }
     }
-    if (ret == 0)
-      return 0;
+    if (ret == PQ_OK)
+      return PQ_OK;
 
     pop_logout (ctx);
 
-    if (ret < -1)
-      return -1;
+    if (ret == PQ_ERR)
+      return PQ_NOT_CONNECTED;
 
     if (query_quadoption (OPT_POPRECONNECT,
                           _("Connection lost. Reconnect to POP server?")) !=
         M_YES)
-      return -1;
+      return PQ_NOT_CONNECTED;
   }
 }