Use p_new instead of xmalloc()

[apps/madmutt.git] / imap / browse.c

diff --git a/imap/browse.c b/imap/browse.c
index 7cff939..4f4bee0 100644 (file)
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -10,21 +10,10 @@
 
 /* Mutt browser support routines */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
 
 #include <lib-ui/enter.h>
 
-
 #include "mutt.h"
 #include "imap_private.h"
 
@@ -123,8 +112,7 @@ int imap_browse (char *path, struct browser_state *state)
             mbox[n] = '\0';
           }
         }
-      }
-      while (ascii_strncmp (idata->cmd.buf, idata->cmd.seq, SEQLEN));
+      } while (m_strncmp(idata->cmd.buf, idata->cmd.seq, SEQLEN));
     }
 
     /* if we're descending a folder, mark it as current in browser_state */
@@ -288,7 +276,7 @@ int imap_mailbox_rename (const char *mailbox)
   IMAP_DATA *idata;
   IMAP_MBOX mx;
   char buf[LONG_STRING];
-  char newname[SHORT_STRING];
+  char newname[STRING];
 
   if (imap_parse_path (mailbox, &mx) < 0) {
     return -1;
@@ -357,8 +345,7 @@ static int browse_add_list_result (IMAP_DATA * idata, const char *cmd,
         imap_add_folder (idata->delim, name, noselect, noinferiors, state,
                          isparent);
     }
-  }
-  while ((ascii_strncmp (idata->cmd.buf, idata->cmd.seq, SEQLEN) != 0));
+  } while ((m_strncmp(idata->cmd.buf, idata->cmd.seq, SEQLEN) != 0));
 
   p_delete(&mx.mbox);
   return 0;
@@ -554,8 +541,7 @@ static int browse_verify_namespace (IMAP_DATA * idata,
                                     &nsi->noinferiors, &delim) != 0)
         return -1;
       nsi->listable |= (name != NULL);
-    }
-    while ((ascii_strncmp (idata->cmd.buf, idata->cmd.seq, SEQLEN) != 0));
+    } while ((m_strncmp(idata->cmd.buf, idata->cmd.seq, SEQLEN) != 0));
   }
 
   return 0;