#include "mem.h"
-char *safe_strdup (const char *s)
+char *str_dup (const char *s)
{
char *p;
size_t l;
- if (!s || !*s)
- return 0;
- l = safe_strlen (s) + 1;
- p = (char *) safe_malloc (l);
+ if (!s) return 0;
+ l = str_len (s) + 1;
+ p = (char *) mem_malloc (l);
memcpy (p, s, l);
return (p);
}
-char *safe_strcat (char *d, size_t l, const char *s)
+char *str_cat (char *d, size_t l, const char *s)
{
char *p = d;
return p;
}
-char *safe_strncat (char *d, size_t l, const char *s, size_t sl)
+char *str_ncat (char *d, size_t l, const char *s, size_t sl)
{
char *p = d;
return p;
}
-int safe_strcmp (const char *a, const char *b)
+int str_cmp (const char *a, const char *b)
{
return strcmp (NONULL (a), NONULL (b));
}
-int safe_strcasecmp (const char *a, const char *b)
+int str_casecmp (const char *a, const char *b)
{
return strcasecmp (NONULL (a), NONULL (b));
}
-int safe_strncmp (const char *a, const char *b, size_t l)
+int str_ncmp (const char *a, const char *b, size_t l)
{
return strncmp (NONULL (a), NONULL (b), l);
}
-int safe_strncasecmp (const char *a, const char *b, size_t l)
+int str_ncasecmp (const char *a, const char *b, size_t l)
{
return strncasecmp (NONULL (a), NONULL (b), l);
}
-size_t safe_strlen (const char *a)
+size_t str_len (const char *a)
{
return a ? strlen (a) : 0;
}
-int safe_strcoll (const char *a, const char *b)
+int str_coll (const char *a, const char *b)
{
return strcoll (NONULL (a), NONULL (b));
}
void str_replace (char **p, const char *s)
{
- FREE (p);
- *p = safe_strdup (s);
+ mem_free (p);
+ *p = str_dup (s);
}
void str_adjust (char **p)
{
if (!p || !*p)
return;
- safe_realloc (p, safe_strlen (*p) + 1);
+ mem_realloc (p, str_len (*p) + 1);
}
/* convert all characters in the string to lowercase */
if (end)
len = end - begin;
else
- len = safe_strlen (begin);
+ len = str_len (begin);
- p = safe_malloc (len + 1);
+ p = mem_malloc (len + 1);
memcpy (p, begin, len);
p[len] = 0;
return p;
}
int str_eq (const char* s1, const char* s2) {
- int l = safe_strlen (s1);
+ int l = str_len (s1);
- if (l != safe_strlen (s2))
+ if (l != str_len (s2))
return (0);
- return (safe_strncmp (s1, s2, l) == 0);
+ return (str_ncmp (s1, s2, l) == 0);
}
char* str_skip_initws (char* s) {
void str_skip_trailws (char *s) {
char *p;
- for (p = s + safe_strlen (s) - 1; p >= s && ISSPACE (*p); p--)
+ for (p = s + str_len (s) - 1; p >= s && ISSPACE (*p); p--)
*p = 0;
}