removed useless newlines

[dmenu.git] / util.c

diff --git a/util.c b/util.c
index dff7af7..b4b163a 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,5 +1,4 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>

  * See LICENSE file for license details.
  */
 #include "dmenu.h"
  * See LICENSE file for license details.
  */
 #include "dmenu.h"


@@ -13,35 +12,23 @@
 /* static */
 
 static void
 /* static */
 
 static void

-bad_malloc(unsigned int size)
-{
+badmalloc(unsigned int size) {

        eprint("fatal: could not malloc() %u bytes\n", size);
 }
 
 /* extern */
 
 void *
        eprint("fatal: could not malloc() %u bytes\n", size);
 }
 
 /* extern */
 
 void *

-emalloc(unsigned int size)
-{
+emalloc(unsigned int size) {

        void *res = malloc(size);
        void *res = malloc(size);

-       if(!res)
-               bad_malloc(size);
-       return res;
-}
-
-void *
-emallocz(unsigned int size)
-{
-       void *res = calloc(1, size);

 
        if(!res)
 
        if(!res)

-               bad_malloc(size);
+               badmalloc(size);

        return res;
 }
 
 void
        return res;
 }
 
 void

-eprint(const char *errstr, ...)
-{
+eprint(const char *errstr, ...) {

        va_list ap;
 
        va_start(ap, errstr);
        va_list ap;
 
        va_start(ap, errstr);


@@ -51,18 +38,10 @@ eprint(const char *errstr, ...)
 }
 
 char *
 }
 
 char *

-estrdup(const char *str)
-{
+estrdup(const char *str) {

        void *res = strdup(str);
        void *res = strdup(str);

+

        if(!res)
        if(!res)

-               bad_malloc(strlen(str));
+               badmalloc(strlen(str));

        return res;
 }
        return res;
 }

-
-void
-swap(void **p1, void **p2)
-{
-       void *tmp = *p1;
-       *p1 = *p2;
-       *p2 = tmp;
-}