reindent and optimizations in BUFFER* struct.

[apps/madmutt.git] / handler.c

diff --git a/handler.c b/handler.c
index 53b519a..553ff29 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -18,8 +18,12 @@
 #include <sys/wait.h>
 #include <sys/stat.h>
 
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
-#include "ascii.h"
 #include "recvattach.h"
 #include "handler.h"
 #include "mutt_curses.h"
@@ -34,9 +38,6 @@
 #include "attach.h"
 #include "lib.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 typedef int handler_f (BODY *, STATE *);
@@ -198,7 +199,7 @@ void mutt_decode_quoted (STATE * s, long len, int istext, iconv_t cd)
     if (fgets (line, MIN ((ssize_t) sizeof (line), len + 1), s->fpin) == NULL)
       break;
 
-    linelen = str_len (line);
+    linelen = m_strlen(line);
     len -= linelen;
 
     /*
@@ -325,14 +326,14 @@ void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd)
   while (len > 0) {
     if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
       return;
-    len -= str_len (tmps);
+    len -= m_strlen(tmps);
     if ((!str_ncmp (tmps, "begin", 5)) && ISSPACE (tmps[5]))
       break;
   }
   while (len > 0) {
     if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
       return;
-    len -= str_len (tmps);
+    len -= m_strlen(tmps);
     if (!str_ncmp (tmps, "end", 3))
       break;
     pt = tmps;
@@ -473,7 +474,7 @@ static void enriched_wrap (struct enriched_state *stte)
   stte->indent_len = 0;
   if (stte->s->prefix) {
     state_puts (stte->s->prefix, stte->s);
-    stte->indent_len += str_len (stte->s->prefix);
+    stte->indent_len += m_strlen(stte->s->prefix);
   }
 
   if (stte->tag_level[RICH_EXCERPT]) {
@@ -481,11 +482,11 @@ static void enriched_wrap (struct enriched_state *stte)
     while (x) {
       if (stte->s->prefix) {
         state_puts (stte->s->prefix, stte->s);
-        stte->indent_len += str_len (stte->s->prefix);
+        stte->indent_len += m_strlen(stte->s->prefix);
       }
       else {
         state_puts ("> ", stte->s);
-        stte->indent_len += str_len ("> ");
+        stte->indent_len += m_strlen("> ");
       }
       x--;
     }
@@ -515,7 +516,7 @@ static void enriched_flush (struct enriched_state *stte, int wrap)
     stte->line_used += stte->buff_used;
     if (stte->line_used > stte->line_max) {
       stte->line_max = stte->line_used;
-      mem_realloc (&stte->line, stte->line_max + 1);
+      p_realloc(&stte->line, stte->line_max + 1);
     }
     strcat (stte->line, stte->buffer);  /* __STRCAT_CHECKED__ */
     stte->line_len += stte->word_len;
@@ -532,7 +533,7 @@ static void enriched_putc (int c, struct enriched_state *stte)
   if (stte->tag_level[RICH_PARAM]) {
     if (stte->tag_level[RICH_COLOR]) {
       if (stte->param_used + 1 >= stte->param_len)
-        mem_realloc (&stte->param, (stte->param_len += STRING));
+        p_realloc(&stte->param, (stte->param_len += STRING));
 
       stte->param[stte->param_used++] = c;
     }
@@ -542,7 +543,7 @@ static void enriched_putc (int c, struct enriched_state *stte)
   /* see if more space is needed (plus extra for possible rich characters) */
   if (stte->buff_len < stte->buff_used + 3) {
     stte->buff_len += LONG_STRING;
-    mem_realloc (&stte->buffer, stte->buff_len + 1);
+    p_realloc(&stte->buffer, stte->buff_len + 1);
   }
 
   if ((!stte->tag_level[RICH_NOFILL] && ISSPACE (c)) || c == '\0') {
@@ -585,16 +586,16 @@ static void enriched_putc (int c, struct enriched_state *stte)
 
 static void enriched_puts (const char *s, struct enriched_state *stte)
 {
-  char *c;
+  const char *p;
 
-  if (stte->buff_len < stte->buff_used + str_len (s)) {
+  if (stte->buff_len < stte->buff_used + m_strlen(s)) {
     stte->buff_len += LONG_STRING;
-    mem_realloc (&stte->buffer, stte->buff_len + 1);
+    p_realloc(&stte->buffer, stte->buff_len + 1);
   }
-  c = s;
-  while (*c) {
-    stte->buffer[stte->buff_used++] = *c;
-    c++;
+
+  p = s;
+  while (*p) {
+    stte->buffer[stte->buff_used++] = *p++;
   }
 }
 
@@ -677,21 +678,21 @@ int text_enriched_handler (BODY * a, STATE * s)
   int tag_len = 0;
   char tag[LONG_STRING + 1];
 
-  memset (&stte, 0, sizeof (stte));
+  p_clear(&stte, 1);
   stte.s = s;
   stte.WrapMargin =
     ((s->flags & M_DISPLAY) ? (COLS - 4) : ((COLS - 4) <
                                             72) ? (COLS - 4) : 72);
   stte.line_max = stte.WrapMargin * 4;
-  stte.line = (char *) mem_calloc (1, stte.line_max + 1);
-  stte.param = (char *) mem_calloc (1, STRING);
+  stte.line = p_new(char, stte.line_max + 1);
+  stte.param = p_new(char, STRING);
 
   stte.param_len = STRING;
   stte.param_used = 0;
 
   if (s->prefix) {
     state_puts (s->prefix, s);
-    stte.indent_len += str_len (s->prefix);
+    stte.indent_len += m_strlen(s->prefix);
   }
 
   while (state != DONE) {
@@ -775,9 +776,9 @@ int text_enriched_handler (BODY * a, STATE * s)
 
   state_putc ('\n', s);         /* add a final newline */
 
-  mem_free (&(stte.buffer));
-  mem_free (&(stte.line));
-  mem_free (&(stte.param));
+  p_delete(&(stte.buffer));
+  p_delete(&(stte.line));
+  p_delete(&(stte.param));
 
   return (0);
 }
@@ -830,7 +831,7 @@ static int alternative_handler (BODY * a, STATE * s)
     }
     else {
       wild = 1;
-      btlen = str_len (t->data);
+      btlen = m_strlen(t->data);
     }
 
     if (a && a->parts)
@@ -936,7 +937,7 @@ static int message_handler (BODY * a, STATE * s)
 {
   struct stat st;
   BODY *b;
-  LOFF_T off_start;
+  off_t off_start;
   int rc = 0;
 
   off_start = ftello (s->fpin);
@@ -1095,11 +1096,11 @@ static int autoview_handler (BODY * a, STATE * s)
   snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
   rfc1524_mailcap_lookup (a, type, entry, M_AUTOVIEW);
 
-  fname = str_dup (a->filename);
+  fname = m_strdup(a->filename);
   mutt_sanitize_filename (fname, 1);
   rfc1524_expand_filename (entry->nametemplate, fname, tempfile,
                            sizeof (tempfile));
-  mem_free (&fname);
+  p_delete(&fname);
 
   if (entry->command) {
     strfcpy (command, entry->command, sizeof (command));
@@ -1288,7 +1289,7 @@ void mutt_decode_attachment (BODY * b, STATE * s)
 
   if (istext) {
     if (s->flags & M_CHARCONV) {
-      char *charset = mutt_get_parameter ("charset", b->parameter);
+      const char *charset = mutt_get_parameter ("charset", b->parameter);
 
       if (!option (OPTSTRICTMIME) && !charset)
         charset = mutt_get_first_charset (AssumedCharset);