use m_strdup and m_strlen that are inlined for efficiency

[apps/madmutt.git] / sidebar.c

diff --git a/sidebar.c b/sidebar.c
index 6948607..da858b1 100644 (file)
--- a/sidebar.c
+++ b/sidebar.c
@@ -13,6 +13,7 @@
  */
 
 #include <lib-lib/mem.h>
  */
 
 #include <lib-lib/mem.h>

+#include <lib-lib/str.h>

 #include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include <lib-lib/macros.h>
 
 #include "mutt.h"


@@ -22,7 +23,6 @@
 #include "buffy.h"
 #include "keymap.h"
 
 #include "buffy.h"
 #include "keymap.h"
 

-#include "lib/str.h"

 
 #include <libgen.h>
 #include <ctype.h>
 
 #include <libgen.h>
 #include <ctype.h>


@@ -60,11 +60,11 @@ static char *shortened_hierarchy (char *box, int maxlen)
 {
   int dots = 0;
   char *last_dot = NULL;
 {
   int dots = 0;
   char *last_dot = NULL;

-  int i, j, len = str_len (box);
+  int i, j, len = m_strlen(box);

   char *new_box;
 
   if (!SidebarBoundary || !*SidebarBoundary)
   char *new_box;
 
   if (!SidebarBoundary || !*SidebarBoundary)

-    return (str_dup (box));
+    return (m_strdup(box));

 
   for (i = 0; i < len; ++i) {
     if (strchr (SidebarBoundary, box[i])) {
 
   for (i = 0; i < len; ++i) {
     if (strchr (SidebarBoundary, box[i])) {


@@ -81,7 +81,7 @@ static char *shortened_hierarchy (char *box, int maxlen)
       if (strchr (SidebarBoundary, box[i])) {
         new_box[j++] = box[i];
         new_box[j] = 0;
       if (strchr (SidebarBoundary, box[i])) {
         new_box[j++] = box[i];
         new_box[j] = 0;

-        if (&box[i + 1] != last_dot || j + str_len (last_dot) > maxlen) {
+        if (&box[i + 1] != last_dot || j + m_strlen(last_dot) > maxlen) {

           new_box[j++] = box[i + 1];
           new_box[j] = 0;
         } else {
           new_box[j++] = box[i + 1];
           new_box[j] = 0;
         } else {


@@ -92,7 +92,7 @@ static char *shortened_hierarchy (char *box, int maxlen)
     }
     return new_box;
   }
     }
     return new_box;
   }

-  return str_dup (box);
+  return m_strdup(box);

 }
 
 static const char* sidebar_number_format (char* dest, size_t destlen, char op,
 }
 
 static const char* sidebar_number_format (char* dest, size_t destlen, char op,


@@ -191,9 +191,9 @@ int make_sidebar_entry (char* box, int idx, size_t len)
   int shortened = 0, lencnt = 0;
   char no[SHORT_STRING], entry[SHORT_STRING];
 #if USE_IMAP
   int shortened = 0, lencnt = 0;
   char no[SHORT_STRING], entry[SHORT_STRING];
 #if USE_IMAP

-  int l = str_len (ImapHomeNamespace);
+  int l = m_strlen(ImapHomeNamespace);

 #endif
 #endif

-  int l_m = str_len (Maildir);
+  int l_m = m_strlen(Maildir);

 
   if (SidebarWidth > COLS)
     SidebarWidth = COLS;
 
   if (SidebarWidth > COLS)
     SidebarWidth = COLS;


@@ -207,17 +207,17 @@ int make_sidebar_entry (char* box, int idx, size_t len)
 
   mutt_FormatString (no, len, NONULL (SidebarNumberFormat),
                      sidebar_number_format, idx, M_FORMAT_OPTIONAL);
 
   mutt_FormatString (no, len, NONULL (SidebarNumberFormat),
                      sidebar_number_format, idx, M_FORMAT_OPTIONAL);

-  lencnt = str_len (no);
+  lencnt = m_strlen(no);

   memset (&entry, ' ', sizeof (entry));
 
 #if USE_IMAP
   if (l > 0 && str_ncmp (box, ImapHomeNamespace, l) == 0 && 
   memset (&entry, ' ', sizeof (entry));
 
 #if USE_IMAP
   if (l > 0 && str_ncmp (box, ImapHomeNamespace, l) == 0 && 

-      str_len (box) > l)
+      m_strlen(box) > l)

     box += l + 1; /* we're trimming the ImapHomeNamespace, the "+ 1" is for the separator */
   else
 #endif
   if (l_m > 0 && str_ncmp (box, Maildir, l_m) == 0 && 
     box += l + 1; /* we're trimming the ImapHomeNamespace, the "+ 1" is for the separator */
   else
 #endif
   if (l_m > 0 && str_ncmp (box, Maildir, l_m) == 0 && 

-      str_len (box) > l_m) {
+      m_strlen(box) > l_m) {

     box += l_m;
     if (Maildir[strlen(Maildir)-1]!='/') {
       box += 1;
     box += l_m;
     if (Maildir[strlen(Maildir)-1]!='/') {
       box += 1;


@@ -225,13 +225,13 @@ int make_sidebar_entry (char* box, int idx, size_t len)
   } else
     box = basename (box);
 
   } else
     box = basename (box);
 

-  if (option (OPTSHORTENHIERARCHY) && str_len (box) > len-lencnt-1) {
+  if (option (OPTSHORTENHIERARCHY) && m_strlen(box) > len-lencnt-1) {

     box = shortened_hierarchy (box, len-lencnt-1);
     shortened = 1;
   }
 
   snprintf (entry, len-lencnt, "%s", box);
     box = shortened_hierarchy (box, len-lencnt-1);
     shortened = 1;
   }
 
   snprintf (entry, len-lencnt, "%s", box);

-  entry[str_len (entry)] = ' ';
+  entry[m_strlen(entry)] = ' ';

   strncpy (entry + (len - lencnt), no, lencnt);
 
   addnstr (entry, len);
   strncpy (entry + (len - lencnt), no, lencnt);
 
   addnstr (entry, len);


@@ -281,7 +281,7 @@ void sidebar_draw_frames (void) {
   if (!option(OPTMBOXPANE) || SidebarWidth==0) 
     return;
 
   if (!option(OPTMBOXPANE) || SidebarWidth==0) 
     return;
 

-  delim_len=str_len(NONULL(SidebarDelim));
+  delim_len=m_strlen(NONULL(SidebarDelim));

 
   /* draw vertical delimiter */
   SETCOLOR (MT_COLOR_SIDEBAR);
 
   /* draw vertical delimiter */
   SETCOLOR (MT_COLOR_SIDEBAR);


@@ -328,7 +328,7 @@ int sidebar_draw (int menu) {
       last_line = LINES - 2 + (option (OPTSTATUSONTOP) && !option (OPTHELP) ? 1 : 0),
       i = 0,line;
   BUFFY *tmp;
       last_line = LINES - 2 + (option (OPTSTATUSONTOP) && !option (OPTHELP) ? 1 : 0),
       i = 0,line;
   BUFFY *tmp;

-  size_t delim_len = str_len (SidebarDelim);
+  size_t delim_len = m_strlen(SidebarDelim);

   char blank[SHORT_STRING];
 
   known_lines=last_line-first_line;
   char blank[SHORT_STRING];
 
   known_lines=last_line-first_line;


@@ -352,7 +352,7 @@ int sidebar_draw (int menu) {
   }
 
   if (SidebarWidth > 0 && option (OPTMBOXPANE)
   }
 
   if (SidebarWidth > 0 && option (OPTMBOXPANE)

-      && str_len (SidebarDelim) >= SidebarWidth) {
+      && m_strlen(SidebarDelim) >= SidebarWidth) {

     mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar."));
     sleep (2);
     unset_option (OPTMBOXPANE);
     mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar."));
     sleep (2);
     unset_option (OPTMBOXPANE);