Extract filesystem-related functions into fs.c

[tinc] / src / utils.h

diff --git a/src/utils.h b/src/utils.h
index b7093e1..c33e28e 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -26,15 +26,22 @@
 #include "crypto.h"
 
 #define B64_SIZE(len) ((len) * 4 / 3 + 5)
+#define HEX_SIZE(len) ((len) * 2 + 1)
 
 extern size_t hex2bin(const char *src, void *dst, size_t length);
 extern size_t bin2hex(const void *src, char *dst, size_t length);
 
+// Returns true if string represents a base-10 integer.
+extern bool is_decimal(const char *str);
+
+// The reverse of atoi().
+extern char *int_to_str(int num);
+
 extern size_t b64encode_tinc(const void *src, char *dst, size_t length);
 extern size_t b64encode_tinc_urlsafe(const void *src, char *dst, size_t length);
 extern size_t b64decode_tinc(const char *src, void *dst, size_t length);
 
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
 extern const char *winerror(int);
 #define strerror(x) ((x)>0?strerror(x):winerror(GetLastError()))
 #define sockerrno WSAGetLastError()
@@ -63,12 +70,11 @@ static inline suseconds_t jitter(void) {
 }
 #endif
 
-extern unsigned int bitfield_to_int(const void *bitfield, size_t size);
-
 extern bool check_id(const char *id);
 extern bool check_netname(const char *netname, bool strict);
-char *replace_name(const char *name);
+char *replace_name(const char *name) ATTR_MALLOC;
 
-extern FILE *fopenmask(const char *filename, const char *mode, mode_t perms);
+// NULL-safe wrapper around strcmp().
+extern bool string_eq(const char *first, const char *second);
 
 #endif