X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Futils.h;h=6c01e6ae84262b68347dc370449d6cdabda57fab;hp=67c94f3d3927330ed0f0ca9bd2c0547f8c9f3a3f;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=86c2990327fdf7ec1197aa73cb2b9a926a734db4 diff --git a/src/utils.h b/src/utils.h index 67c94f3d..6c01e6ae 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 + Copyright (C) 2014, 2017 Guus Sliepen 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,12 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __TINC_UTILS_H__ -#define __TINC_UTILS_H__ - -extern int hex2bin(const char *src, char *dst, int length); -extern int bin2hex(const char *src, char *dst, int length); +extern int hex2bin(const char *src, void *dst, int length); +extern int bin2hex(const void *src, char *dst, int length); -extern int b64encode(const char *src, char *dst, int length); -extern int b64decode(const char *src, char *dst, int length); +extern int b64encode(const void *src, char *dst, int length); +extern int b64encode_urlsafe(const void *src, char *dst, int length); +extern int b64decode(const char *src, void *dst, int length); #ifdef HAVE_MINGW extern const char *winerror(int); @@ -45,6 +45,6 @@ extern const char *winerror(int); #define sockinuse(x) ((x) == EADDRINUSE) #endif -extern unsigned int bitfield_to_int(const void *bitfield, size_t size); +extern unsigned int bitfield_to_int(const void *bitfield, size_t size) __attribute__((__warn_unused_result__)); -#endif /* __TINC_UTILS_H__ */ +#endif