projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move ascii.* into the lib-lib.
[apps/madmutt.git]
/
charset.c
diff --git
a/charset.c
b/charset.c
index
9bf63f8
..
5d7e0cc
100644
(file)
--- a/
charset.c
+++ b/
charset.c
@@
-23,14
+23,13
@@
#include <errno.h>
#include <lib-lib/mem.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 "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
#ifndef EILSEQ
# define EILSEQ EINVAL
@@
-198,15
+197,15
@@
void mutt_set_langinfo_charset (void)
mutt_canonical_charset (buff2, sizeof (buff2), buff);
/* finally, set $charset */
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)
{
}
#else
void mutt_set_langinfo_charset (void)
{
- Charset =
str_dup
("iso-8859-1");
+ Charset =
m_strdup
("iso-8859-1");
}
#endif
}
#endif
@@
-317,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;
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;
char *ob1 = ob;
size_t obl1 = obl;
@@
-337,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) {
outrepl = "?";
my_iconv(cd, 0, 0, &ob, &obl);
if (obl) {
- int n =
str_len
(outrepl);
+ int n =
m_strlen
(outrepl);
if (n > obl) {
outrepl = "?";
if (n > obl) {
outrepl = "?";
@@
-388,7
+387,7
@@
int mutt_convert_string (char **ps, const char *from, const char *to,
else
outrepl = "?";
else
outrepl = "?";
- len =
str_len
(s);
+ len =
m_strlen
(s);
ib = s, ibl = len + 1;
obl = MB_LEN_MAX * ibl;
ob = buf = xmalloc(obl + 1);
ib = s, ibl = len + 1;
obl = MB_LEN_MAX * ibl;
ob = buf = xmalloc(obl + 1);
@@
-543,7
+542,7
@@
const char *mutt_get_first_charset (const char *charset)
const char *c, *c1;
c = 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);
return "us-ascii";
if (!(c1 = strchr (c, ':')))
return ((char*) charset);
@@
-577,7
+576,7
@@
static size_t convert_string (const char *f, size_t flen,
*tlen = ob - buf;
*tlen = ob - buf;
-
mem_realloc
(&buf, ob - buf + 1);
+
p_realloc
(&buf, ob - buf + 1);
*t = buf;
iconv_close (cd);
*t = buf;
iconv_close (cd);
@@
-593,14
+592,14
@@
int mutt_convert_nonmime_string (char **ps)
char *s = NULL;
char *fromcode;
size_t m, n;
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, ':');
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 = p_dupstr(c, n);
if (!n)
continue;
fromcode = p_dupstr(c, n);