X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fxalloc.h;h=e521d64a203d3b82c98a6c6e08d7510db24a832c;hb=e25370c54e78fda0a7996b008f7ad68aa80f2ccd;hp=4c3e741a929a32602ba086c6262e138f7c8d6f16;hpb=158cbe99f972a1613b7d4d95abfe5fe48e019e67;p=meshlink

diff --git a/src/xalloc.h b/src/xalloc.h
index 4c3e741a..e521d64a 100644
--- a/src/xalloc.h
+++ b/src/xalloc.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_XALLOC_H
+#define MESHLINK_XALLOC_H
+
 /*
    xalloc.h -- malloc and related fuctions with out of memory checking
-   Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+   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
@@ -17,10 +20,7 @@
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_XALLOC_H__
-#define __TINC_XALLOC_H__
-
-static inline void *xmalloc(size_t n) __attribute__ ((__malloc__));
+static inline void *xmalloc(size_t n) __attribute__((__malloc__));
 static inline void *xmalloc(size_t n) {
 	void *p = malloc(n);
 	if(!p)
@@ -28,7 +28,7 @@ static inline void *xmalloc(size_t n) {
 	return p;
 }
 
-static inline void *xzalloc(size_t n) __attribute__ ((__malloc__));
+static inline void *xzalloc(size_t n) __attribute__((__malloc__));
 static inline void *xzalloc(size_t n) {
 	void *p = calloc(1, n);
 	if(!p)
@@ -43,7 +43,7 @@ static inline void *xrealloc(void *p, size_t n) {
 	return p;
 }
 
-static inline char *xstrdup(const char *s) __attribute__ ((__malloc__));
+static inline char *xstrdup(const char *s) __attribute__((__malloc__));
 static inline char *xstrdup(const char *s) {
 	char *p = strdup(s);
 	if(!p)
@@ -54,7 +54,7 @@ static inline char *xstrdup(const char *s) {
 static inline int xvasprintf(char **strp, const char *fmt, va_list ap) {
 #ifdef HAVE_MINGW
 	char buf[1024];
-	int result = vsnprintf(buf, sizeof buf, fmt, ap);
+	int result = vsnprintf(buf, sizeof(buf), fmt, ap);
 	if(result < 0)
 		abort();
 	*strp = xstrdup(buf);
@@ -66,7 +66,7 @@ static inline int xvasprintf(char **strp, const char *fmt, va_list ap) {
 	return result;
 }
 
-static inline int xasprintf(char **strp, const char *fmt, ...) __attribute__ ((__format__(printf, 2, 3)));
+static inline int xasprintf(char **strp, const char *fmt, ...) __attribute__((__format__(printf, 2, 3)));
 static inline int xasprintf(char **strp, const char *fmt, ...) {
 	va_list ap;
 	va_start(ap, fmt);