Makefile.am: Add test/inc/test-eom-align to XFAIL_TESTS.

[nmh] / uip / popsbr.c

diff --git a/uip/popsbr.c b/uip/popsbr.c
index a02295763bf4097133797abeb70fcd618e74b14f..14bc9fc1fe5c73c5afdce3b54e6bdda9f30fd8c4 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -480,58 +480,6 @@ pop_stat (int *nmsgs, int *nbytes)
 }
 
 
-int
-pop_list (int msgno, int *nmsgs, int *msgs, int *bytes)
-{
-    int i;
-    int *ids = NULL;
-
-    if (msgno) {
-       if (command ("LIST %d", msgno) == NOTOK)
-           return NOTOK;
-       *msgs = *bytes = 0;
-       if (ids) {
-           *ids = 0;
-           sscanf (response, "+OK %d %d %d", msgs, bytes, ids);
-       }
-       else
-           sscanf (response, "+OK %d %d", msgs, bytes);
-       return OK;
-    }
-
-    if (command ("LIST") == NOTOK)
-       return NOTOK;
-
-    for (i = 0; i < *nmsgs; i++)
-       switch (multiline ()) {
-           case NOTOK: 
-               return NOTOK;
-           case DONE: 
-               *nmsgs = ++i;
-               return OK;
-           case OK: 
-               *msgs = *bytes = 0;
-               if (ids) {
-                   *ids = 0;
-                   sscanf (response, "%d %d %d",
-                           msgs++, bytes++, ids++);
-               }
-               else
-                   sscanf (response, "%d %d", msgs++, bytes++);
-               break;
-       }
-    for (;;)
-       switch (multiline ()) {
-           case NOTOK: 
-               return NOTOK;
-           case DONE: 
-               return OK;
-           case OK: 
-               break;
-       }
-}
-
-
 int
 pop_retr (int msgno, int (*action)(char *))
 {
@@ -582,27 +530,6 @@ pop_dele (int msgno)
 }
 
 
-int
-pop_noop (void)
-{
-    return command ("NOOP");
-}
-
-
-int
-pop_rset (void)
-{
-    return command ("RSET");
-}
-
-
-int
-pop_top (int msgno, int lines, int (*action)(char *))
-{
-    return traverse (action, "TOP %d %d", msgno, lines);
-}
-
-
 int
 pop_quit (void)
 {
@@ -734,7 +661,7 @@ pop_getline (char *s, int n, netsec_context *ns)
      * someday.
      */
 
-    destlen = len < ((size_t) (n - 1)) ? len : (size_t) (n - 1);
+    destlen = min(len, (size_t)(n - 1));
 
     memcpy(s, p, destlen);
     s[destlen] = '\0';