From e6d5f9552e66ee2db3056e810b58b2bf82551356 Mon Sep 17 00:00:00 2001
From: Aleksey Veresov <aleksey@veresov.pro>
Date: Fri, 15 Nov 2019 15:06:13 +0300
Subject: Merge remote-tracking branch 'croco/master' into test

---
 src/utils.h | 87 +++----------------------------------------------------------
 1 file changed, 4 insertions(+), 83 deletions(-)

(limited to 'src/utils.h')

diff --git a/src/utils.h b/src/utils.h
index f16ea3f..fa7db40 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -2,89 +2,10 @@
 #define MAGI_INCLUDED_UTILS
 
 
-static void lowercase(char * str)
-{
-    if (str) {
-        while (*str) {
-            *str = tolower(*str);
-            ++str;
-        }
-    }
-}
-
-static char * create_str(const char * begin, const char * end)
-{
-    char * res;
-    res = malloc(end - begin + 1);
-    if (res) {
-        memcpy(res, begin, end - begin);
-        res[end - begin] = 0;
-    } else {
-        magi_log("Cannot allocate string.");
-    }
-    return res;
-}
-
-static char * str_alloc(int len)
-{
-    char * str = malloc(len + 1);
-    if (str) {
-        str[len] = 0;
-    } else {
-        magi_log("[request] Cannot allocate string.");
-    }
-    return str;
-}
-
-/* Shouldn't be called with 'c' as not hex digit. */
-static char from_hex(char c)
-{
-    char num;
-    if (isdigit(c)) {
-        num = c - '0';
-    } else {
-        num = toupper(c) - 'A' + 10;
-    }
-    return num;
-}
-
-static int is_hex(char c)
-{
-    return isdigit(c) || strchr("ABCDEF", toupper(c));
-}
-
-static int add(char ** dest, int * len, int * size, char c)
-{
-    int ok = 1;
-    if (*len + 1 == *size) {
-        *size *= 2;
-        *dest = realloc(*dest, *size);
-    }
-    if (*dest == 0) {
-        ok = 0;
-        magi_log("Cannot allocate string.");
-    } else {
-        (*dest)[*len] = c;
-        ++*len;
-        (*dest)[*len] = 0;
-    }
-    return ok;
-}
-
-static int is_token(char c)
-{
-    return 32 <= c && c <= 126 && !strchr("()<>@,;:\\\"/[]?={} \t", c);
-}
-
-static int is_str_token(char * str)
-{
-    int is = str && *str; /* Empty string is not valid. */
-    while (is && *str) {
-        is = is_token(*str);
-        ++str;
-    }
-    return is;
-}
+void   magi_str_lowercase(char * str);
+char * magi_str_create_copy(const char * begin, const char * end);
+char * magi_str_create(int len);
+int    magi_str_add(char ** dest, int * len, int * size, char c);
 
 
 #endif
-- 
cgit v1.2.3