X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Futils.h;h=dfbb2055a6b6f196e145438371707a83eef72a0a;hb=4b6c01b1d5383b1a7417244a31ad4652aab2d5db;hp=fddb8a67a3a279c3a35d3247811c5b9abc063be5;hpb=ce8775000ab38229a78ecf3dc26bab008ca0f332;p=meshlink

diff --git a/src/utils.h b/src/utils.h
index fddb8a67..dfbb2055 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,7 +1,9 @@
+#ifndef MESHLINK_UTILS_H
+#define MESHLINK_UTILS_H
+
 /*
     utils.h -- header file for utils.c
-    Copyright (C) 1999-2005 Ivo Timmermans
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,14 +20,15 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_UTILS_H__
-#define __TINC_UTILS_H__
+int hex2bin(const char *src, void *dst, int length);
+int bin2hex(const void *src, char *dst, int length);
 
-extern void hex2bin(char *src, char *dst, int length);
-extern void bin2hex(char *src, char *dst, int length);
+int b64encode(const void *src, char *dst, int length);
+int b64encode_urlsafe(const void *src, char *dst, int length);
+int b64decode(const char *src, void *dst, int length);
 
 #ifdef HAVE_MINGW
-extern const char *winerror(int);
+const char *winerror(int);
 #define strerror(x) ((x)>0?strerror(x):winerror(GetLastError()))
 #define sockerrno WSAGetLastError()
 #define sockstrerror(x) winerror(x)
@@ -42,6 +45,6 @@ extern const char *winerror(int);
 #define sockinuse(x) ((x) == EADDRINUSE)
 #endif
 
-extern unsigned int bitfield_to_int(void *bitfield, size_t size);
+unsigned int bitfield_to_int(const void *bitfield, size_t size) __attribute__((__warn_unused_result__));
 
-#endif							/* __TINC_UTILS_H__ */
+#endif