X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Futils.h;h=6c01e6ae84262b68347dc370449d6cdabda57fab;hp=c0b677fcccbef542069800b916bf625e020308f9;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=43ed5b9a5d739c50317d5d24898de07526a9297f diff --git a/src/utils.h b/src/utils.h index c0b677fc..6c01e6ae 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,6 +1,9 @@ +#ifndef MESHLINK_UTILS_H +#define MESHLINK_UTILS_H + /* utils.h -- header file for utils.c - Copyright (C) 2014 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 @@ -17,9 +20,6 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __MESHLINK_UTILS_H__ -#define __MESHLINK_UTILS_H__ - extern int hex2bin(const char *src, void *dst, int length); extern int bin2hex(const void *src, char *dst, int length); @@ -45,9 +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__)); -extern char *get_ip_str(const struct sockaddr *sa, char *s, size_t maxlen); -extern char *get_port_str(const struct sockaddr *sa, char *s, size_t maxlen); - -#endif /* __MESHLINK_UTILS_H__ */ +#endif