xutils: break out string handling and locking

Break out all string handling functions and lockme stuff in order
to further eliminate the big code blob in xutils, so that it can
be easier maintained.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>

1 files changed, 1 insertions, 88 deletions

diff --git a/xutils.c b/xutils.c
index 8856b3a..b539d8c 100644
--- a/xutils.c
+++ b/xutils.c
@@ -41,6 +41,7 @@
 #include <netinet/udp.h>
 
 #include "die.h"
+#include "str.h"
 #include "xutils.h"
 #include "ring.h"
 #include "built_in.h"
@@ -707,94 +708,6 @@ int set_sched_status(int policy, int priority)
 	return 0;
 }
 
-void xlockme(void)
-{
-	if (mlockall(MCL_CURRENT | MCL_FUTURE) != 0)
-		panic("Cannot lock pages!\n");
-}
-
-void xunlockme(void)
-{
-	munlockall();
-}
-
-size_t strlcpy(char *dest, const char *src, size_t size)
-{
-	size_t ret = strlen(src);
-
-	if (size) {
-		size_t len = (ret >= size) ? size - 1 : ret;
-
-		memcpy(dest, src, len);
-		dest[len] = '\0';
-	}
-
-	return ret;
-}
-
-static inline int vslprintf(char *dst, size_t size, const char *fmt, va_list ap)
-{
-	int ret;
-
-	ret = vsnprintf(dst, size, fmt, ap);
-	dst[size - 1] = '\0';
-
-	return ret;
-}
-
-int slprintf(char *dst, size_t size, const char *fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vslprintf(dst, size, fmt, ap);
-	va_end(ap);
-
-	return ret;
-}
-
-int slprintf_nocheck(char *dst, size_t size, const char *fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vslprintf(dst, size, fmt, ap);
-	va_end(ap);
-
-	return ret;
-}
-
-noinline void *xmemset(void *s, int c, size_t n)
-{
-	size_t i;
-	uint8_t *ptr = s;
-
-	for (i = 0; i < n; ++i)
-		ptr[i] = (uint8_t) c;
-
-	return ptr;
-}
-
-char *strtrim_right(char *p, char c)
-{
-	char *end;
-	size_t len;
-
-	len = strlen(p);
-	while (*p && len) {
-		end = p + len - 1;
-		if (c == *end)
-			*end = 0;
-		else
-			break;
-		len = strlen(p);
-	}
-
-	return p;
-}
-
 int get_default_sched_policy(void)
 {
 	return SCHED_FIFO;