summaryrefslogtreecommitdiffstats
path: root/discover/user-event.c
diff options
context:
space:
mode:
authorGeoff Levand <geoff@infradead.org>2018-08-02 17:29:34 +0000
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>2018-08-07 11:30:36 +1000
commitc78f9ec47ba92b74698dacdae963dbbefd9b676f (patch)
tree58ce2f0f50f8edb451f81d9ecedc9abc842bc3d6 /discover/user-event.c
parent679d9dceb5bdf51f118548ca2645dc81088a8974 (diff)
downloadtalos-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 'discover/user-event.c')
-rw-r--r--discover/user-event.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/discover/user-event.c b/discover/user-event.c
index 128186b..1257796 100644
--- a/discover/user-event.c
+++ b/discover/user-event.c
@@ -94,13 +94,13 @@ static struct resource *user_event_resource(struct discover_boot_option *opt,
siaddr = event_get_param(event, "siaddr");
if (!siaddr) {
- pb_log("%s: next server option not found\n", __func__);
+ pb_log_fn("next server option not found\n");
return NULL;
}
boot_file = event_get_param(event, "bootfile");
if (!boot_file) {
- pb_log("%s: bootfile not found\n", __func__);
+ pb_log_fn("bootfile not found\n");
return NULL;
}
@@ -148,7 +148,7 @@ static int parse_user_event(struct discover_context *ctx, struct event *event)
val = event_get_param(event, "name");
if (!val) {
- pb_log("%s: no name found\n", __func__);
+ pb_log_fn("no name found\n");
goto fail_opt;
}
@@ -157,7 +157,7 @@ static int parse_user_event(struct discover_context *ctx, struct event *event)
d_opt->boot_image = user_event_resource(d_opt, event, false);
if (!d_opt->boot_image) {
- pb_log("%s: no boot image found for %s!\n", __func__,
+ pb_log_fn("no boot image found for %s!\n",
opt->name);
goto fail_opt;
}
@@ -288,7 +288,7 @@ struct pb_url *user_event_parse_conf_url(struct discover_context *ctx,
host = parse_host_addr(event);
if (!host) {
- pb_log("%s: host address not found\n", __func__);
+ pb_log_fn("host address not found\n");
/* No full URLs and no host address? Check for DHCPv6 options */
if (bootfile_url && is_url(bootfile_url)) {
@@ -362,7 +362,7 @@ char **user_event_parse_conf_filenames(
}
if (!mac_addr && !ip_hex) {
- pb_log("%s: neither mac nor ip parameter found\n", __func__);
+ pb_log_fn("neither mac nor ip parameter found\n");
return NULL;
}
@@ -672,12 +672,12 @@ static int user_event_process(void *arg)
len = recvfrom(uev->socket, buf, PBOOT_USER_EVENT_SIZE, 0, NULL, NULL);
if (len < 0) {
- pb_log("%s: socket read failed: %s", __func__, strerror(errno));
+ pb_log_fn("socket read failed: %s\n", strerror(errno));
return 0;
}
if (len == 0) {
- pb_log("%s: empty", __func__);
+ pb_log_fn("empty\n");
return 0;
}
OpenPOWER on IntegriCloud