Moved varstrlen to xstring

basin/src/game.c

@@ -29,6 +29,7 @@
 #include <unistd.h>
 #include "tileentity.h"
 #include <stdarg.h>
+#include "xstring.h"
 
 void flush_outgoing(struct player* player) {
 	if (player->conn == NULL) return;

basin/src/util.c

@@ -12,7 +12,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#include <stdarg.h>
 
 void* xmalloc(size_t size) {
 	if (size > 10485760) {
@@ -117,22 +116,3 @@ int memseq(const unsigned char* mem, size_t mem_size, const unsigned char c) {
 	}
 	return 1;
 }
-
-size_t varstrlen(const char* fmt, const va_list args) {
-	va_list args_cpy ;
-	va_copy(args_cpy, args);
-
-	size_t len = strlen(fmt) + 64;
-	for (const char* p = fmt; *p != '\0'; p++) {
-		if (*p != '%')
-			continue;
-		switch (*++p) {
-			case 's':
-				len += strlen(va_arg(args_cpy, char *));
-				break;
-			default:
-				va_arg(args_cpy, int); // pop from list
-		}
-	}
-	return len;
-}

basin/src/util.h

@@ -30,7 +30,4 @@ int memeq(const unsigned char* mem1, size_t mem1_size, const unsigned char* mem2
 
 int memseq(const unsigned char* mem, size_t mem_size, const unsigned char c);
 
-// Estimates vararg string length based on format string and STRING ARGS ONLY
-size_t varstrlen(const char* fmt, const va_list args);
-
 #endif /* UTIL_H_ */

basin/src/xstring.c

@@ -10,6 +10,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include "util.h"
+#include <stdarg.h>
 
 char* trim(char* str) {
 	if (str == NULL) return NULL;
@@ -269,3 +270,20 @@ int strisunum(const char* str) {
 	return 1;
 }
 
+size_t varstrlen(const char* fmt, const va_list args) {
+	va_list args_cpy;
+	va_copy(args_cpy, args);
+
+	size_t len = strlen(fmt) + 64;
+	for (const char* p = fmt; *p != '\0'; p++) {
+		if (*p != '%') continue;
+		switch (*++p) {
+		case 's':
+			len += strlen(va_arg(args_cpy, char *));
+			break;
+		default:
+		va_arg(args_cpy, int); // pop from list
+	}
+}
+return len;
+}

basin/src/xstring.h

@@ -40,4 +40,6 @@ char* replace_nocase(char* str, char* from, char* to);
 
 int strisunum(const char* str);
 
+size_t varstrlen(const char* fmt, const va_list args);
+
 #endif /* XSTRING_H_ */