lib/log: Switch to pb_log_fn

[petitboot] / ui / common / joystick.c

diff --git a/ui/common/joystick.c b/ui/common/joystick.c
index 94c85feba4ba1f1111e07d928879a04854e68b02..f75ae3d384bb79e9e14778918f695b0b4b6fc33f 100644 (file)
--- a/ui/common/joystick.c
+++ b/ui/common/joystick.c
@@ -20,7 +20,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -48,7 +47,7 @@ int pjs_process_event(const struct pjs *pjs)
        result = read(pjs->fd, &e, sizeof(e));
 
        if (result != sizeof(e)) {
-               pb_log("%s: read failed: %s\n", __func__, strerror(errno));
+               pb_log_fn("read failed: %s\n", strerror(errno));
                return 0;
        }
 
@@ -87,20 +86,20 @@ struct pjs *pjs_init(void *ctx, int (*map)(const struct js_event *))
        pjs->fd = open(dev_name, O_RDONLY | O_NONBLOCK);
 
        if (pjs->fd < 0) {
-               pb_log("%s: open %s failed: %s\n", __func__, dev_name,
+               pb_log_fn("open %s failed: %s\n", dev_name,
                        strerror(errno));
                goto out_err;
        }
 
        talloc_set_destructor(pjs, pjs_destructor);
 
-       pb_log("%s: using %s\n", __func__, dev_name);
+       pb_debug("%s: using %s\n", __func__, dev_name);
 
        return pjs;
 
 out_err:
-       close(pjs->fd);
-       pjs->fd = 0;
+       if (pjs->fd >= 0)
+               close(pjs->fd);
        talloc_free(pjs);
        return NULL;
 }