[PATCH] Fix compilations warnings

[apps/madmutt.git] / charset.c

diff --git a/charset.c b/charset.c
index 14e79f4..9826ef4 100644 (file)
--- a/charset.c
+++ b/charset.c
@@ -22,13 +22,14 @@
 #include <unistd.h>
 #include <errno.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 "charset.h"
-#include "ascii.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 
 #ifndef EILSEQ
 # define EILSEQ EINVAL
@@ -192,19 +193,19 @@ void mutt_set_langinfo_charset (void)
   char buff[LONG_STRING];
   char buff2[LONG_STRING];
 
-  strfcpy (buff, nl_langinfo (CODESET), sizeof (buff));
+  m_strcpy(buff, sizeof(buff), nl_langinfo(CODESET));
   mutt_canonical_charset (buff2, sizeof (buff2), buff);
 
   /* finally, set $charset */
-  if (!(Charset = str_dup (buff2)))
-    Charset = str_dup ("iso-8859-1");
+  if (!(Charset = m_strdup(buff2)))
+    Charset = m_strdup("iso-8859-1");
 }
 
 #else
 
 void mutt_set_langinfo_charset (void)
 {
-  Charset = str_dup ("iso-8859-1");
+  Charset = m_strdup("iso-8859-1");
 }
 
 #endif
@@ -225,16 +226,16 @@ void mutt_canonical_charset (char *dest, size_t dlen, const char *name)
   else if (!ascii_strncasecmp (name, "iso8859-", 8))
     snprintf (scratch, sizeof (scratch), "iso_8859-%s", name + 8);
   else
-    strfcpy (scratch, NONULL (name), sizeof (scratch));
+    m_strcpy(scratch, sizeof(scratch), NONULL(name));
 
   for (i = 0; PreferredMIMENames[i].key; i++)
     if (!ascii_strcasecmp (scratch, PreferredMIMENames[i].key) ||
-        !str_casecmp (scratch, PreferredMIMENames[i].key)) {
-      strfcpy (dest, PreferredMIMENames[i].pref, dlen);
+        !m_strcasecmp(scratch, PreferredMIMENames[i].key)) {
+      m_strcpy(dest, dlen, PreferredMIMENames[i].pref);
       return;
     }
 
-  strfcpy (dest, scratch, dlen);
+  m_strcpy(dest, dlen, scratch);
 
   /* for cosmetics' sake, transform to lowercase. */
   for (p = dest; *p; p++)
@@ -315,7 +316,7 @@ size_t mutt_iconv (iconv_t cd, const char **inbuf, size_t * inbytesleft,
 
         for (t = inrepls; *t; t++) {
           const char *ib1 = *t;
-          size_t ibl1 = str_len (*t);
+          size_t ibl1 = m_strlen(*t);
           char *ob1 = ob;
           size_t obl1 = obl;
 
@@ -335,7 +336,7 @@ size_t mutt_iconv (iconv_t cd, const char **inbuf, size_t * inbytesleft,
         outrepl = "?";
       my_iconv(cd, 0, 0, &ob, &obl);
       if (obl) {
-        int n = str_len (outrepl);
+        size_t n = m_strlen(outrepl);
 
         if (n > obl) {
           outrepl = "?";
@@ -386,17 +387,17 @@ int mutt_convert_string (char **ps, const char *from, const char *to,
     else
       outrepl = "?";
 
-    len = str_len (s);
+    len = m_strlen(s);
     ib = s, ibl = len + 1;
     obl = MB_LEN_MAX * ibl;
-    ob = buf = mem_malloc (obl + 1);
+    ob = buf = xmalloc(obl + 1);
 
     mutt_iconv (cd, &ib, &ibl, &ob, &obl, inrepls, outrepl);
     iconv_close (cd);
 
     *ob = '\0';
 
-    mem_free (ps);
+    p_delete(ps);
     *ps = buf;
 
     str_adjust (ps);
@@ -440,14 +441,14 @@ FGETCONV *fgetconv_open (FILE * file, const char *from, const char *to,
     cd = mutt_iconv_open (to, from, flags);
 
   if (cd != (iconv_t) - 1) {
-    fc = mem_malloc (sizeof (struct fgetconv_s));
+    fc = p_new(struct fgetconv_s, 1);
     fc->p = fc->ob = fc->bufo;
     fc->ib = fc->bufi;
     fc->ibl = 0;
     fc->inrepls = mutt_is_utf8 (to) ? repls : repls + 1;
   }
   else
-    fc = mem_malloc (sizeof (struct fgetconv_not));
+    fc = p_new(struct fgetconv_s, 1);
   fc->file = file;
   fc->cd = cd;
   return (FGETCONV *) fc;
@@ -532,7 +533,7 @@ void fgetconv_close (FGETCONV ** _fc)
 
   if (fc->cd != (iconv_t) - 1)
     iconv_close (fc->cd);
-  mem_free (_fc);
+  p_delete(_fc);
 }
 
 const char *mutt_get_first_charset (const char *charset)
@@ -541,11 +542,11 @@ const char *mutt_get_first_charset (const char *charset)
   const char *c, *c1;
 
   c = charset;
-  if (!str_len (c))
+  if (!m_strlen(c))
     return "us-ascii";
   if (!(c1 = strchr (c, ':')))
     return ((char*) charset);
-  strfcpy (fcharset, c, c1 - c + 1);
+  m_strcpy(fcharset, c1 - c + 1, c);
   return fcharset;
 }
 
@@ -555,18 +556,19 @@ static size_t convert_string (const char *f, size_t flen,
 {
   iconv_t cd;
   char *buf, *ob;
-  size_t obl, n;
+  size_t obl;
+  ssize_t n;
   int e;
 
   cd = mutt_iconv_open (to, from, 0);
   if (cd == (iconv_t) (-1))
     return (size_t) (-1);
   obl = 4 * flen + 1;
-  ob = buf = mem_malloc (obl);
+  ob = buf = xmalloc(obl);
   n = my_iconv(cd, &f, &flen, &ob, &obl);
-  if (n == (size_t) (-1) || my_iconv(cd, 0, 0, &ob, &obl) == (size_t) (-1)) {
+  if (n < 0 || my_iconv(cd, 0, 0, &ob, &obl) < 0) {
     e = errno;
-    mem_free (&buf);
+    p_delete(&buf);
     iconv_close (cd);
     errno = e;
     return (size_t) (-1);
@@ -575,7 +577,7 @@ static size_t convert_string (const char *f, size_t flen,
 
   *tlen = ob - buf;
 
-  mem_realloc (&buf, ob - buf + 1);
+  p_realloc(&buf, ob - buf + 1);
   *t = buf;
   iconv_close (cd);
 
@@ -591,22 +593,21 @@ int mutt_convert_nonmime_string (char **ps)
     char *s = NULL;
     char *fromcode;
     size_t m, n;
-    size_t ulen = str_len (*ps);
+    size_t ulen = m_strlen(*ps);
     size_t slen;
 
     if (!u || !*u)
       return 0;
 
     c1 = strchr (c, ':');
-    n = c1 ? c1 - c : str_len (c);
+    n = c1 ? c1 - c : m_strlen(c);
     if (!n)
       continue;
-    fromcode = mem_malloc (n + 1);
-    strfcpy (fromcode, c, n + 1);
+    fromcode = p_dupstr(c, n);
     m = convert_string (u, ulen, fromcode, Charset, &s, &slen);
-    mem_free (&fromcode);
+    p_delete(&fromcode);
     if (m != (size_t) (-1)) {
-      mem_free (ps);
+      p_delete(ps);
       *ps = s;
       return 0;
     }