projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
lib
/
str.c
diff --git
a/lib/str.c
b/lib/str.c
index
8efa126
..
f70bfda
100644
(file)
--- a/
lib/str.c
+++ b/
lib/str.c
@@
-16,20
+16,20
@@
#include "mem.h"
#include "mem.h"
-char *s
afe_str
dup (const char *s)
+char *s
tr_
dup (const char *s)
{
char *p;
size_t l;
if (!s || !*s)
return 0;
{
char *p;
size_t l;
if (!s || !*s)
return 0;
- l = s
afe_str
len (s) + 1;
- p = (char *)
safe
_malloc (l);
+ l = s
tr_
len (s) + 1;
+ p = (char *)
mem
_malloc (l);
memcpy (p, s, l);
return (p);
}
memcpy (p, s, l);
return (p);
}
-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
+48,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
+67,47
@@
char *safe_strncat (char *d, size_t l, const char *s, size_t sl)
return p;
}
return p;
}
-int s
afe_str
cmp (const char *a, const char *b)
+int s
tr_
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 s
afe_str
len (const char *a)
+size_t s
tr_
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);
+
mem_free
(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, safe_str
len (*p) + 1);
+
mem_realloc (p, str_
len (*p) + 1);
}
/* convert all characters in the string to lowercase */
}
/* convert all characters in the string to lowercase */
@@
-146,9
+146,9
@@
char *str_substrdup (const char *begin, const char *end)
if (end)
len = end - begin;
else
if (end)
len = end - begin;
else
- len = s
afe_str
len (begin);
+ len = s
tr_
len (begin);
- p =
safe
_malloc (len + 1);
+ p =
mem
_malloc (len + 1);
memcpy (p, begin, len);
p[len] = 0;
return p;
memcpy (p, begin, len);
p[len] = 0;
return p;
@@
-175,16
+175,22
@@
const char *str_isstr (const char *haystack, const char *needle)
return NULL;
}
return NULL;
}
-char *mutt_skip_whitespace (char *p)
-{
- SKIPWS (p);
- return p;
+int str_eq (const char* s1, const char* s2) {
+ int l = str_len (s1);
+
+ if (l != str_len (s2))
+ return (0);
+ return (str_ncmp (s1, s2, l) == 0);
}
}
-void mutt_remove_trailing_ws (char *s)
-{
+char* str_skip_initws (char* s) {
+ SKIPWS (s);
+ return (s);
+}
+
+void str_skip_trailws (char *s) {
char *p;
char *p;
- for (p = s + s
afe_str
len (s) - 1; p >= s && ISSPACE (*p); p--)
+ for (p = s + s
tr_
len (s) - 1; p >= s && ISSPACE (*p); p--)
*p = 0;
}
*p = 0;
}