X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Futils.c;h=c395169d4ba05801cdef49d9bcdfb1fe3ff1c2e7;hb=c44b08613508c993e7fd9f625e0b1b4775efffed;hp=6104fada3ab62b2007be2d5f4c835c06f963970a;hpb=b2701c7c54b11cda71461c5dbbc985476bf5b221;p=tinc

diff --git a/src/utils.c b/src/utils.c
index 6104fada..c395169d 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -18,6 +18,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include <assert.h>
+
 #include "logger.h"
 #include "system.h"
 #include "utils.h"
@@ -119,6 +121,24 @@ size_t b64decode_tinc(const char *src, void *dst, size_t length) {
 	}
 }
 
+bool is_decimal(const char *str) {
+	if(!str) {
+		return false;
+	}
+
+	errno = 0;
+	char *badchar = NULL;
+	strtol(str, &badchar, 10);
+	return !errno && badchar != str && !*badchar;
+}
+
+// itoa() conflicts with a similarly named function under MinGW.
+char *int_to_str(int num) {
+	char *str = NULL;
+	xasprintf(&str, "%d", num);
+	return str;
+}
+
 static size_t b64encode_tinc_internal(const void *src, char *dst, size_t length, const char *alphabet) {
 	uint32_t triplet;
 	const unsigned char *usrc = (unsigned char *)src;
@@ -176,7 +196,7 @@ size_t b64encode_tinc_urlsafe(const void *src, char *dst, size_t length) {
 	return b64encode_tinc_internal(src, dst, length, base64_urlsafe);
 }
 
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
 const char *winerror(int err) {
 	static char buf[1024], *ptr;
 
@@ -195,17 +215,6 @@ const char *winerror(int err) {
 }
 #endif
 
-unsigned int bitfield_to_int(const void *bitfield, size_t size) {
-	unsigned int value = 0;
-
-	if(size > sizeof(value)) {
-		size = sizeof(value);
-	}
-
-	memcpy(&value, bitfield, size);
-	return value;
-}
-
 bool check_id(const char *id) {
 	if(!id || !*id) {
 		return false;