use m_strdup and m_strlen that are inlined for efficiency

[apps/madmutt.git] / browser.c

diff --git a/browser.c b/browser.c
index 1a1f71e..03e1db9 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -11,6 +11,10 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "mx.h"
@@ -31,9 +35,6 @@
 #endif
 #include "sidebar.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/list.h"
 
 #include <stdlib.h>
@@ -49,7 +50,7 @@ static struct mapping_t FolderHelp[] = {
   {N_("Chdir"), OP_CHANGE_DIRECTORY},
   {N_("Mask"), OP_ENTER_MASK},
   {N_("Help"), OP_HELP},
-  {NULL}
+  {NULL, OP_NULL}
 };
 
 #ifdef USE_NNTP
@@ -61,7 +62,7 @@ static struct mapping_t FolderNewsHelp[] = {
   {N_("Catchup"), OP_CATCHUP},
   {N_("Mask"), OP_ENTER_MASK},
   {N_("Help"), OP_HELP},
-  {NULL}
+  {NULL, OP_NULL}
 };
 #endif
 
@@ -79,14 +80,14 @@ static void destroy_state (struct browser_state *state)
   int c;
 
   for (c = 0; c < state->entrylen; c++) {
-    mem_free (&((state->entry)[c].name));
-    mem_free (&((state->entry)[c].desc));
-    mem_free (&((state->entry)[c].st));
+    p_delete(&((state->entry)[c].name));
+    p_delete(&((state->entry)[c].desc));
+    p_delete(&((state->entry)[c].st));
   }
 #ifdef USE_IMAP
-  mem_free (&state->folder);
+  p_delete(&state->folder);
 #endif
-  mem_free (&state->entry);
+  p_delete(&state->entry);
 }
 
 static int browser_compare_subject (const void *a, const void *b)
@@ -167,8 +168,8 @@ static const char *folder_format_str (char *dest, size_t destlen, char op,
                                       const char *elsestring,
                                       unsigned long data, format_flag flags)
 {
-  char fn[SHORT_STRING], tmp[SHORT_STRING], permission[11];
-  char date[16], *t_fmt;
+  char fn[SHORT_STRING], tmp[SHORT_STRING], permission[11], date[16];
+  const char *t_fmt;
   time_t tnow;
   FOLDER *folder = (FOLDER *) data;
   struct passwd *pw;
@@ -197,7 +198,7 @@ static const char *folder_format_str (char *dest, size_t destlen, char op,
 
   case 'f':
     {
-      char *s;
+      const char *s;
 
 #ifdef USE_IMAP
       if (folder->ff->imap)
@@ -427,26 +428,22 @@ static void add_folder (MUTTMENU * m, struct browser_state *state,
 {
   if (state->entrylen == state->entrymax) {
     /* need to allocate more space */
-    mem_realloc (&state->entry,
-                  sizeof (struct folder_file) * (state->entrymax += 256));
-    memset (&state->entry[state->entrylen], 0,
-            sizeof (struct folder_file) * 256);
+    p_realloc(&state->entry, state->entrymax += 256);
+    p_clear(&state->entry[state->entrylen], 256);
     if (m)
       m->data = state->entry;
   }
 
   if (s != NULL) {
-    (state->entry)[state->entrylen].mode = s->st_mode;
+    (state->entry)[state->entrylen].mode  = s->st_mode;
     (state->entry)[state->entrylen].mtime = s->st_mtime;
-    (state->entry)[state->entrylen].size = s->st_size;
-
-    (state->entry)[state->entrylen].st = mem_malloc (sizeof (struct stat));
-    memcpy ((state->entry)[state->entrylen].st, s, sizeof (struct stat));
+    (state->entry)[state->entrylen].size  = s->st_size;
+    (state->entry)[state->entrylen].st    = p_dup(s, 1);
   }
 
   (state->entry)[state->entrylen].new = new;
-  (state->entry)[state->entrylen].name = str_dup (name);
-  (state->entry)[state->entrylen].desc = str_dup (name);
+  (state->entry)[state->entrylen].name = m_strdup(name);
+  (state->entry)[state->entrylen].desc = m_strdup(name);
 #ifdef USE_IMAP
   (state->entry)[state->entrylen].imap = 0;
 #endif
@@ -461,9 +458,7 @@ static void init_state (struct browser_state *state, MUTTMENU * menu)
 {
   state->entrylen = 0;
   state->entrymax = 256;
-  state->entry =
-    (struct folder_file *) mem_calloc (state->entrymax,
-                                        sizeof (struct folder_file));
+  state->entry = p_new(struct folder_file, state->entrymax);
 #ifdef USE_IMAP
   state->imap_browse = 0;
 #endif
@@ -489,7 +484,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
         continue;
       nntp_sync_sidebar (data);
       if (prefix && *prefix && strncmp (prefix, data->group,
-                                        str_len (prefix)) != 0)
+                                        m_strlen(prefix)) != 0)
         continue;
       if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.not))
         continue;
@@ -539,7 +534,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
         continue;               /* we don't need . */
 
       if (prefix && *prefix
-          && str_ncmp (prefix, de->d_name, str_len (prefix)) != 0)
+          && str_ncmp (prefix, de->d_name, m_strlen(prefix)) != 0)
         continue;
       if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.not))
         continue;
@@ -780,7 +775,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
     }
     else {
 #endif
-      for (i = str_len (f) - 1; i > 0 && f[i] != '/'; i--);
+      for (i = m_strlen(f) - 1; i > 0 && f[i] != '/'; i--);
       if (i > 0) {
         if (f[0] == '/') {
           if (i > sizeof (LastDir) - 1)
@@ -898,7 +893,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
           strfcpy (OldLastDir, LastDir, sizeof (OldLastDir));
 
           if (str_cmp (state.entry[menu->current].name, "..") == 0) {
-            if (str_cmp ("..", LastDir + str_len (LastDir) - 2) == 0)
+            if (str_cmp ("..", LastDir + m_strlen(LastDir) - 2) == 0)
               strcat (LastDir, "/..");  /* __STRCAT_CHECKED__ */
             else {
               char *p = strrchr (LastDir + 1, '/');
@@ -926,7 +921,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
             strfcpy (LastDir, state.entry[menu->current].name,
                      sizeof (LastDir));
             /* tack on delimiter here */
-            n = str_len (LastDir) + 1;
+            n = m_strlen(LastDir) + 1;
 
             /* special case "" needs no delimiter */
             url_parse_ciss (&url, state.entry[menu->current].name);
@@ -1003,7 +998,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
 
         if (menu->tagged) {
           *numfiles = menu->tagged;
-          tfiles = mem_calloc (*numfiles, sizeof (char *));
+          tfiles = p_new(char *, *numfiles);
           for (i = 0, j = 0; i < state.entrylen; i++) {
             struct folder_file ff = state.entry[i];
             char full[_POSIX_PATH_MAX];
@@ -1011,16 +1006,16 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
             if (ff.tagged) {
               mutt_concat_path (full, LastDir, ff.name, sizeof (full));
               mutt_expand_path (full, sizeof (full));
-              tfiles[j++] = str_dup (full);
+              tfiles[j++] = m_strdup(full);
             }
           }
           *files = tfiles;
         }
         else if (f[0]) {        /* no tagged entries. return selected entry */
           *numfiles = 1;
-          tfiles = mem_calloc (*numfiles, sizeof (char *));
+          tfiles = p_new(char *, *numfiles);
           mutt_expand_path (f, flen);
-          tfiles[0] = str_dup (f);
+          tfiles[0] = m_strdup(f);
           *files = tfiles;
         }
       }
@@ -1100,8 +1095,8 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
         if (mutt_yesorno (msg, M_NO) == M_YES) {
           if (!imap_delete_mailbox (Context, mx)) {
             /* free the mailbox from the browser */
-            mem_free (&((state.entry)[nentry].name));
-            mem_free (&((state.entry)[nentry].desc));
+            p_delete(&((state.entry)[nentry].name));
+            p_delete(&((state.entry)[nentry].desc));
             /* and move all other entries up */
             if (nentry + 1 < state.entrylen)
               memmove (state.entry + nentry, state.entry + nentry + 1,
@@ -1116,7 +1111,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
         }
         else
           mutt_message _("Mailbox not deleted.");
-        mem_free (&mx.mbox);
+        p_delete(&mx.mbox);
       }
       break;
 #endif
@@ -1134,7 +1129,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
 #endif
       {
         /* add '/' at the end of the directory name if not already there */
-        int len = str_len (LastDir);
+        int len = m_strlen(LastDir);
 
         if (len && LastDir[len - 1] != '/' && sizeof (buf) > len)
           buf[len] = '/';
@@ -1189,7 +1184,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
 
       strfcpy (buf, NONULL (Mask.pattern), sizeof (buf));
       if (mutt_get_field (_("File Mask: "), buf, sizeof (buf), 0) == 0) {
-        regex_t *rx = (regex_t *) mem_malloc (sizeof (regex_t));
+        regex_t *rx = p_new(regex_t, 1);
         char *s = buf;
         int not = 0, err;
 
@@ -1207,13 +1202,13 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
         if ((err = REGCOMP (rx, s, REG_NOSUB)) != 0) {
           regerror (err, rx, buf, sizeof (buf));
           regfree (rx);
-          mem_free (&rx);
+          p_delete(&rx);
           mutt_error ("%s", buf);
         }
         else {
           str_replace (&Mask.pattern, buf);
           regfree (Mask.rx);
-          mem_free (&Mask.rx);
+          p_delete(&Mask.rx);
           Mask.rx = rx;
           Mask.not = not;
 
@@ -1398,11 +1393,11 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
            folder.ff->st = NULL;
            folder.ff->is_new = nd->new;
            folder.ff->nd = nd;
-           mem_free (&f->desc);
+           p_delete(&f->desc);
            mutt_FormatString (buffer, sizeof (buffer), NONULL(GroupFormat),
                  newsgroup_format_str, (unsigned long) &folder,
                  M_FORMAT_ARROWCURSOR);
-           f->desc = str_dup (buffer); */
+           f->desc = m_strdup(buffer); */
           if (menu->current + 1 < menu->max)
             menu->current++;
           menu->redraw = REDRAW_MOTION_RESYNCH;
@@ -1442,7 +1437,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
     case OP_SUBSCRIBE_PATTERN:
     case OP_UNSUBSCRIBE_PATTERN:
       if (option (OPTNEWS)) {
-        regex_t *rx = (regex_t *) mem_malloc (sizeof (regex_t));
+        regex_t *rx = p_new(regex_t, 1);
         char *s = buf;
         int j = menu->current;
         NNTP_DATA *nd;
@@ -1458,14 +1453,14 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
           else
             snprintf (tmp, sizeof (tmp), _("Unsubscribe pattern: "));
           if (mutt_get_field (tmp, buf, sizeof (buf), 0) != 0 || !buf[0]) {
-            mem_free (&rx);
+            p_delete(&rx);
             break;
           }
 
           if ((err = REGCOMP (rx, s, REG_NOSUB)) != 0) {
             regerror (err, rx, buf, sizeof (buf));
             regfree (rx);
-            mem_free (&rx);
+            p_delete(&rx);
             mutt_error ("%s", buf);
             break;
           }
@@ -1496,11 +1491,11 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
                folder.f = NULL;
                folder.new = nd->new;
                folder.nd = nd;
-               mem_free (&f->desc);
+               p_delete(&f->desc);
                mutt_FormatString (buffer, sizeof (buffer), NONULL(GroupFormat),
                        newsgroup_format_str, (unsigned long) &folder,
                        M_FORMAT_ARROWCURSOR);
-               f->desc = str_dup (buffer);
+               f->desc = m_strdup(buffer);
              } */
           }
           if (i == OP_BROWSER_SUBSCRIBE || i == OP_BROWSER_UNSUBSCRIBE) {
@@ -1530,7 +1525,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
         nntp_clear_cacheindex (news);
         if (i != OP_BROWSER_SUBSCRIBE && i != OP_BROWSER_UNSUBSCRIBE)
           regfree (rx);
-        mem_free (&rx);
+        p_delete(&rx);
       }
 #ifdef USE_IMAP
       else