From b1d15f894473d4b1e90ad273487a432bcd637195 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Fri, 17 Jan 2014 14:50:54 +0800 Subject: discover: Don't rely on ctx->conf_url side-effect in user_event_parse_conf_url Currently, user_event_parse_conf_url sets dc->conf_url if it detects we have a full URL (rather than a base URL). This is a little too subtle, so replace it with an explicit output parameter. Signed-off-by: Jeremy Kerr --- discover/user-event.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'discover/user-event.h') diff --git a/discover/user-event.h b/discover/user-event.h index 976c257..b892c9a 100644 --- a/discover/user-event.h +++ b/discover/user-event.h @@ -19,6 +19,8 @@ #if !defined(_PB_DISCOVER_USER_EVENT_H) #define _PB_DISCOVER_USER_EVENT_H +#include + #include "device-handler.h" #define PBOOT_USER_EVENT_SOCKET "/tmp/petitboot.ev" @@ -28,7 +30,7 @@ struct user_event; struct waitset; struct pb_url *user_event_parse_conf_url(struct discover_context *ctx, - struct event *event); + struct event *event, bool *complete_url); char **user_event_parse_conf_filenames( struct discover_context *ctx, struct event *event); struct user_event *user_event_init(struct waitset *waitset, -- cgit v1.2.1