projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revamp lib.[hc] functions into lib-lib/file.[hc].
[apps/madmutt.git]
/
lib
/
str.c
diff --git
a/lib/str.c
b/lib/str.c
index
26df4b2
..
f90e861
100644
(file)
--- a/
lib/str.c
+++ b/
lib/str.c
@@
-12,21
+12,10
@@
#include <string.h>
#include <ctype.h>
#include <string.h>
#include <ctype.h>
-#include "str.h"
-
-#include "mem.h"
-
-char *str_dup (const char *s)
-{
- char *p;
- size_t l;
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
- if (!s) return 0;
- l = str_len (s) + 1;
- p = (char *) mem_malloc (l);
- memcpy (p, s, l);
- return (p);
-}
+#include "str.h"
char *str_cat (char *d, size_t l, const char *s)
{
char *str_cat (char *d, size_t l, const char *s)
{
@@
-66,11
+55,6
@@
char *str_ncat (char *d, size_t l, const char *s, size_t sl)
return p;
}
return p;
}
-int str_cmp (const char *a, const char *b)
-{
- return strcmp (NONULL (a), NONULL (b));
-}
-
int str_casecmp (const char *a, const char *b)
{
return strcasecmp (NONULL (a), NONULL (b));
int str_casecmp (const char *a, const char *b)
{
return strcasecmp (NONULL (a), NONULL (b));
@@
-86,11
+70,6
@@
int str_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 str_len (const char *a)
-{
- return a ? strlen (a) : 0;
-}
-
int str_coll (const char *a, const char *b)
{
return strcoll (NONULL (a), NONULL (b));
int str_coll (const char *a, const char *b)
{
return strcoll (NONULL (a), NONULL (b));
@@
-98,15
+77,15
@@
int str_coll (const char *a, const char *b)
void str_replace (char **p, const char *s)
{
void str_replace (char **p, const char *s)
{
-
mem_free
(p);
- *p =
str_dup
(s);
+
p_delete
(p);
+ *p =
m_strdup
(s);
}
void str_adjust (char **p)
{
if (!p || !*p)
return;
}
void str_adjust (char **p)
{
if (!p || !*p)
return;
-
mem_realloc (p, str_len
(*p) + 1);
+
p_realloc(p, m_strlen
(*p) + 1);
}
/* convert all characters in the string to lowercase */
}
/* convert all characters in the string to lowercase */
@@
-137,20
+116,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 = str_len (begin);
-
- p = mem_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)
@@
-175,9
+143,9
@@
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 =
str_len
(s1);
+ int l =
m_strlen
(s1);
- if (l !=
str_len
(s2))
+ if (l !=
m_strlen
(s2))
return (0);
return (str_ncmp (s1, s2, l) == 0);
}
return (0);
return (str_ncmp (s1, s2, l) == 0);
}
@@
-190,6
+158,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 +
str_len
(s) - 1; p >= s && ISSPACE (*p); p--)
+ for (p = s +
m_strlen
(s) - 1; p >= s && ISSPACE (*p); p--)
*p = 0;
}
*p = 0;
}