From 1b2fabe4cc87fc80e901893000f05ea671a7b444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Janouch?= Date: Fri, 8 May 2015 23:29:09 +0200 Subject: [PATCH] Move code within common.c --- common.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/common.c b/common.c index 6006cde..820863d 100644 --- a/common.c +++ b/common.c @@ -47,6 +47,29 @@ #define LOG_LIBC_FAILURE(name) \ print_debug ("%s: %s: %s", __func__, (name), strerror (errno)) +// --- To be moved to liberty -------------------------------------------------- + +static void +split_str (const char *s, char delimiter, struct str_vector *out) +{ + const char *begin = s, *end; + while ((end = strchr (begin, delimiter))) + { + str_vector_add_owned (out, xstrndup (begin, end - begin)); + begin = ++end; + } + str_vector_add (out, begin); +} + +static ssize_t +str_vector_find (const struct str_vector *v, const char *s) +{ + for (size_t i = 0; i < v->len; i++) + if (!strcmp (v->vector[i], s)) + return i; + return -1; +} + // --- Logging ----------------------------------------------------------------- static void @@ -473,29 +496,6 @@ fail: return result; } -// --- To be moved to liberty -------------------------------------------------- - -static void -split_str (const char *s, char delimiter, struct str_vector *out) -{ - const char *begin = s, *end; - while ((end = strchr (begin, delimiter))) - { - str_vector_add_owned (out, xstrndup (begin, end - begin)); - begin = ++end; - } - str_vector_add (out, begin); -} - -static ssize_t -str_vector_find (const struct str_vector *v, const char *s) -{ - for (size_t i = 0; i < v->len; i++) - if (!strcmp (v->vector[i], s)) - return i; - return -1; -} - // --- CTCP decoding ----------------------------------------------------------- #define CTCP_M_QUOTE '\020'