Fix coding style

[slstatus.git] / util.c

diff --git a/util.c b/util.c
index 67b692a..8808aba 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

-#include <err.h>

 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>


@@ -17,8 +16,9 @@ bprintf(const char *fmt, ...)
        len = vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
        va_end(ap);
 
        len = vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
        va_end(ap);
 

-       if (len >= sizeof(buf))
+       if (len >= sizeof(buf)) {

                buf[sizeof(buf)-1] = '\0';
                buf[sizeof(buf)-1] = '\0';

+       }

 
        return buf;
 }
 
        return buf;
 }


@@ -31,7 +31,7 @@ pscanf(const char *path, const char *fmt, ...)
        int n;
 
        if (!(fp = fopen(path, "r"))) {
        int n;
 
        if (!(fp = fopen(path, "r"))) {

-               warn("fopen %s: %s\n", path, strerror(errno));
+               fprintf(stderr, "fopen '%s': %s\n", path, strerror(errno));

                return -1;
        }
        va_start(ap, fmt);
                return -1;
        }
        va_start(ap, fmt);