Reformat all code using astyle.

[tinc] / src / xalloc.h

diff --git a/src/xalloc.h b/src/xalloc.h
index 9d3a71e..0eecda5 100644 (file)
--- a/src/xalloc.h
+++ b/src/xalloc.h
@@ -21,34 +21,46 @@
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 

-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);
 static inline void *xmalloc(size_t n) {
        void *p = malloc(n);

-       if(!p)
+
+       if(!p) {

                abort();
                abort();

+       }
+

        return p;
 }
 
        return p;
 }
 

-static inline void *xmalloc_and_zero(size_t n) __attribute__ ((__malloc__));
+static inline void *xmalloc_and_zero(size_t n) __attribute__((__malloc__));

 static inline void *xmalloc_and_zero(size_t n) {
        void *p = calloc(1, n);
 static inline void *xmalloc_and_zero(size_t n) {
        void *p = calloc(1, n);

-       if(!p)
+
+       if(!p) {

                abort();
                abort();

+       }
+

        return p;
 }
 
 static inline void *xrealloc(void *p, size_t n) {
        p = realloc(p, n);
        return p;
 }
 
 static inline void *xrealloc(void *p, size_t n) {
        p = realloc(p, n);

-       if(!p)
+
+       if(!p) {

                abort();
                abort();

+       }
+

        return p;
 }
 
        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);
 static inline char *xstrdup(const char *s) {
        char *p = strdup(s);

-       if(!p)
+
+       if(!p) {

                abort();
                abort();

+       }
+

        return p;
 }
 
        return p;
 }
 


@@ -56,18 +68,24 @@ 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);
 #ifdef HAVE_MINGW
        char buf[1024];
        int result = vsnprintf(buf, sizeof(buf), fmt, ap);

-       if(result < 0)
+
+       if(result < 0) {

                abort();
                abort();

+       }
+

        *strp = xstrdup(buf);
 #else
        int result = vasprintf(strp, fmt, ap);
        *strp = xstrdup(buf);
 #else
        int result = vasprintf(strp, fmt, ap);

-       if(result < 0)
+
+       if(result < 0) {

                abort();
                abort();

+       }
+

 #endif
        return result;
 }
 
 #endif
        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);
 static inline int xasprintf(char **strp, const char *fmt, ...) {
        va_list ap;
        va_start(ap, fmt);