diff options
author | Geoff Levand <geoff@infradead.org> | 2018-08-02 17:29:34 +0000 |
---|---|---|
committer | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2018-08-07 11:30:36 +1000 |
commit | c78f9ec47ba92b74698dacdae963dbbefd9b676f (patch) | |
tree | 58ce2f0f50f8edb451f81d9ecedc9abc842bc3d6 /ui/twin | |
parent | 679d9dceb5bdf51f118548ca2645dc81088a8974 (diff) | |
download | talos-petitboot-c78f9ec47ba92b74698dacdae963dbbefd9b676f.tar.gz talos-petitboot-c78f9ec47ba92b74698dacdae963dbbefd9b676f.zip |
lib/log: Switch to pb_log_fn
The only functional change should be an additional '/n' to
a few log messagees that seemed to be missing it.
Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Diffstat (limited to 'ui/twin')
-rw-r--r-- | ui/twin/main-generic.c | 4 | ||||
-rw-r--r-- | ui/twin/main-ps3.c | 2 | ||||
-rw-r--r-- | ui/twin/pbt-client.c | 12 | ||||
-rw-r--r-- | ui/twin/pbt-scr.c | 16 |
4 files changed, 17 insertions, 17 deletions
diff --git a/ui/twin/main-generic.c b/ui/twin/main-generic.c index 8ddec9e..a85cace 100644 --- a/ui/twin/main-generic.c +++ b/ui/twin/main-generic.c @@ -204,7 +204,7 @@ static int run(struct pbt_client *client) int result = waiter_poll(client->waitset); if (result < 0) { - pb_log("%s: poll: %s\n", __func__, strerror(errno)); + pb_log_fn("poll: %s\n", strerror(errno)); break; } @@ -304,7 +304,7 @@ int main(int argc, char *argv[]) result += sigaction(SIGWINCH, &sa, NULL); if (result) { - pb_log("%s sigaction failed.\n", __func__); + pb_log_fn("sigaction failed.\n"); return EXIT_FAILURE; } diff --git a/ui/twin/main-ps3.c b/ui/twin/main-ps3.c index ba4b1d7..f98aca8 100644 --- a/ui/twin/main-ps3.c +++ b/ui/twin/main-ps3.c @@ -411,7 +411,7 @@ int main(int argc, char *argv[]) result += sigaction(SIGWINCH, &sa, NULL); if (result) { - pb_log("%s sigaction failed.\n", __func__); + pb_log_fn("sigaction failed.\n"); return EXIT_FAILURE; } diff --git a/ui/twin/pbt-client.c b/ui/twin/pbt-client.c index 48de816..cffb5de 100644 --- a/ui/twin/pbt-client.c +++ b/ui/twin/pbt-client.c @@ -66,7 +66,7 @@ static int pbt_client_boot(struct pbt_item *item) NULL, opt_data->opt, opt_data->bd); if (result) { - pb_log("%s: failed: %s\n", __func__, opt_data->bd->image); + pb_log_fn("failed: %s\n", opt_data->bd->image); pbt_frame_status_printf(&item->pbt_client->frame, "Failed: kexec %s", opt_data->bd->image); } @@ -194,7 +194,7 @@ static void pbt_device_remove(struct device *dev, struct pbt_client *client) } if (!removed_item) { - pb_log("%s: %p %s: unknown device\n", __func__, dev, dev->id); + pb_log_fn("%p %s: unknown device\n", dev, dev->id); assert(0 && "unknown device"); return; } @@ -260,7 +260,7 @@ struct pbt_client *pbt_client_init(enum pbt_twin_backend backend, pbt_client = talloc_zero(NULL, struct pbt_client); if (!pbt_client) { - pb_log("%s: alloc pbt_client failed.\n", __func__); + pb_log_fn("alloc pbt_client failed.\n"); fprintf(stderr, "%s: alloc pbt_client failed.\n", __func__); goto fail_alloc; } @@ -288,7 +288,7 @@ retry_start: &pbt_client_ops, pbt_client); if (pbt_client->discover_client || !i) break; - pb_log("%s: waiting for server %d\n", __func__, i); + pb_log_fn("waiting for server %d\n", i); sleep(1); } @@ -302,7 +302,7 @@ retry_start: if (!result) goto retry_start; - pb_log("%s: discover_client_init failed.\n", __func__); + pb_log_fn("discover_client_init failed.\n"); fprintf(stderr, "%s: error: discover_client_init failed.\n", __func__); fprintf(stderr, "could not start pb-discover, the petitboot " @@ -311,7 +311,7 @@ retry_start: } if (!pbt_client->discover_client) { - pb_log("%s: discover_client_init failed.\n", __func__); + pb_log_fn("discover_client_init failed.\n"); fprintf(stderr, "%s: error: discover_client_init failed.\n", __func__); fprintf(stderr, "check that pb-discover, " diff --git a/ui/twin/pbt-scr.c b/ui/twin/pbt-scr.c index e10cab1..c360047 100644 --- a/ui/twin/pbt-scr.c +++ b/ui/twin/pbt-scr.c @@ -138,7 +138,7 @@ twin_pixmap_t *pbt_background_load(twin_screen_t *tscreen, raw_background = twin_jpeg_to_pixmap(filename, TWIN_ARGB32); if (!raw_background) { - pb_log("%s: loading image '%s' failed\n", __func__, filename); + pb_log_fn("loading image '%s' failed\n", filename); /* Fallback to a default pattern */ @@ -158,7 +158,7 @@ twin_pixmap_t *pbt_background_load(twin_screen_t *tscreen, tscreen->width, tscreen->height); if (!scaled_background) { - pb_log("%s: scale '%s' failed\n", __func__, filename); + pb_log_fn("scale '%s' failed\n", filename); twin_pixmap_destroy(raw_background); return twin_make_pattern(); } @@ -224,7 +224,7 @@ retry: new.icon = twin_png_to_pixmap(filename, TWIN_ARGB32); if (!new.icon) { - pb_log("%s: loading image '%s' failed\n", __func__, filename); + pb_log_fn("loading image '%s' failed\n", filename); if (filename == default_icon_file) return NULL; @@ -384,7 +384,7 @@ struct pbt_scr *pbt_scr_init(void *talloc_ctx, assert(backend && backend < 3); if (!scr) { - pb_log("%s: alloc pbt_scr failed.\n", __func__); + pb_log_fn("alloc pbt_scr failed.\n"); goto fail_alloc; } @@ -395,7 +395,7 @@ struct pbt_scr *pbt_scr_init(void *talloc_ctx, scr->twin_ctx.backend = backend; if (backend == pbt_twin_x11) { - pb_log("%s: using twin x11 backend.\n", __func__); + pb_log_fn("using twin x11 backend.\n"); assert(width > 100); assert(height > 100); @@ -406,7 +406,7 @@ struct pbt_scr *pbt_scr_init(void *talloc_ctx, width, height, 0); if (!scr->twin_ctx.x11) { - pb_log("%s: twin_x11_create_ext failed.\n", __func__); + pb_log_fn("twin_x11_create_ext failed.\n"); perror("failed to create twin x11 context\n"); goto fail_ctx_create; } @@ -418,14 +418,14 @@ struct pbt_scr *pbt_scr_init(void *talloc_ctx, waiter_fd = ConnectionNumber(scr->twin_ctx.x11->dpy); #endif } else if (backend == pbt_twin_fbdev) { - pb_log("%s: using twin fbdev backend.\n", __func__); + pb_log_fn("using twin fbdev backend.\n"); #if !defined(HAVE_LIBTWIN_TWIN_FBDEV_H) assert(0); #else scr->twin_ctx.fbdev = twin_fbdev_create_ext(-1, SIGUSR1, 0); if (!scr->twin_ctx.fbdev) { - pb_log("%s: twin_fbdev_create_ext failed.\n", __func__); + pb_log_fn("twin_fbdev_create_ext failed.\n"); perror("failed to create twin fbdev context\n"); goto fail_ctx_create; } |