projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update gettext
[apps/madmutt.git]
/
lib
/
str.c
diff --git
a/lib/str.c
b/lib/str.c
index
0db2b6e
..
e40e614
100644
(file)
--- a/
lib/str.c
+++ b/
lib/str.c
@@
-12,24
+12,18
@@
#include <string.h>
#include <ctype.h>
#include <string.h>
#include <ctype.h>
-#include
"str.h"
+#include
<lib-lib/mem.h>
-#include "
mem
.h"
+#include "
str
.h"
-char *s
afe_str
dup (const char *s)
+char *s
tr_
dup (const char *s)
{
{
- char *p;
- size_t l;
-
if (!s || !*s)
if (!s || !*s)
- return 0;
- l = mutt_strlen (s) + 1;
- p = (char *) safe_malloc (l);
- memcpy (p, s, l);
- return (p);
+ return NULL;
+ return p_dupstr(s, str_len(s));
}
}
-char *s
afe_str
cat (char *d, size_t l, const char *s)
+char *s
tr_
cat (char *d, size_t l, const char *s)
{
char *p = d;
{
char *p = d;
@@
-48,7
+42,7
@@
char *safe_strcat (char *d, size_t l, const char *s)
return p;
}
return p;
}
-char *s
afe_str
ncat (char *d, size_t l, const char *s, size_t sl)
+char *s
tr_
ncat (char *d, size_t l, const char *s, size_t sl)
{
char *p = d;
{
char *p = d;
@@
-67,47
+61,47
@@
char *safe_strncat (char *d, size_t l, const char *s, size_t sl)
return p;
}
return p;
}
-int
mutt_str
cmp (const char *a, const char *b)
+int
str_
cmp (const char *a, const char *b)
{
return strcmp (NONULL (a), NONULL (b));
}
{
return strcmp (NONULL (a), NONULL (b));
}
-int s
afe_str
casecmp (const char *a, const char *b)
+int s
tr_
casecmp (const char *a, const char *b)
{
return strcasecmp (NONULL (a), NONULL (b));
}
{
return strcasecmp (NONULL (a), NONULL (b));
}
-int s
afe_str
ncmp (const char *a, const char *b, size_t l)
+int s
tr_
ncmp (const char *a, const char *b, size_t l)
{
return strncmp (NONULL (a), NONULL (b), l);
}
{
return strncmp (NONULL (a), NONULL (b), l);
}
-int s
afe_str
ncasecmp (const char *a, const char *b, size_t l)
+int s
tr_
ncasecmp (const char *a, const char *b, size_t l)
{
return strncasecmp (NONULL (a), NONULL (b), l);
}
{
return strncasecmp (NONULL (a), NONULL (b), l);
}
-size_t
mutt_str
len (const char *a)
+size_t
str_
len (const char *a)
{
return a ? strlen (a) : 0;
}
{
return a ? strlen (a) : 0;
}
-int s
afe_str
coll (const char *a, const char *b)
+int s
tr_
coll (const char *a, const char *b)
{
return strcoll (NONULL (a), NONULL (b));
}
void str_replace (char **p, const char *s)
{
{
return strcoll (NONULL (a), NONULL (b));
}
void str_replace (char **p, const char *s)
{
-
FREE
(p);
- *p = s
afe_str
dup (s);
+
p_delete
(p);
+ *p = s
tr_
dup (s);
}
void str_adjust (char **p)
{
if (!p || !*p)
return;
}
void str_adjust (char **p)
{
if (!p || !*p)
return;
-
safe_realloc (p, mutt_str
len (*p) + 1);
+
p_realloc(p, str_
len (*p) + 1);
}
/* convert all characters in the string to lowercase */
}
/* convert all characters in the string to lowercase */
@@
-138,20
+132,9
@@
char *str_substrcpy (char *dest, const char *beg, const char *end,
return dest;
}
return dest;
}
-char *str_substrdup
(const char *begin, const char *end)
+char *str_substrdup(const char *begin, const char *end)
{
{
- size_t len;
- char *p;
-
- if (end)
- len = end - begin;
- else
- len = mutt_strlen (begin);
-
- p = safe_malloc (len + 1);
- memcpy (p, begin, len);
- p[len] = 0;
- return p;
+ return p_dupstr(begin, (end ? end - begin : strlen(begin)));
}
const char *str_isstr (const char *haystack, const char *needle)
}
const char *str_isstr (const char *haystack, const char *needle)
@@
-176,11
+159,11
@@
const char *str_isstr (const char *haystack, const char *needle)
}
int str_eq (const char* s1, const char* s2) {
}
int str_eq (const char* s1, const char* s2) {
- int l =
mutt_str
len (s1);
+ int l =
str_
len (s1);
- if (l !=
mutt_str
len (s2))
+ if (l !=
str_
len (s2))
return (0);
return (0);
- return (s
afe_str
ncmp (s1, s2, l) == 0);
+ return (s
tr_
ncmp (s1, s2, l) == 0);
}
char* str_skip_initws (char* s) {
}
char* str_skip_initws (char* s) {
@@
-191,6
+174,6
@@
char* str_skip_initws (char* s) {
void str_skip_trailws (char *s) {
char *p;
void str_skip_trailws (char *s) {
char *p;
- for (p = s +
mutt_str
len (s) - 1; p >= s && ISSPACE (*p); p--)
+ for (p = s +
str_
len (s) - 1; p >= s && ISSPACE (*p); p--)
*p = 0;
}
*p = 0;
}