summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2016-12-13 09:13:50 +0800
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>2016-12-20 16:40:21 +1100
commit1abc62990a5817de56a55470fb2c62e966134722 (patch)
tree912e5347cbe27366dbec4edf17998f42fc73cb4d
parent4563c5d672f605c493996a652b9e3e588a8596dd (diff)
downloadpetitboot-1abc62990a5817de56a55470fb2c62e966134722.zip
petitboot-1abc62990a5817de56a55470fb2c62e966134722.tar.gz
discover: Add reference to url in load_url_result
We may want to access the loaded URL in a async handler. Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
-rw-r--r--discover/paths.c1
-rw-r--r--discover/paths.h1
-rw-r--r--test/parser/utils.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/discover/paths.c b/discover/paths.c
index 7fcff9e..8d85619 100644
--- a/discover/paths.c
+++ b/discover/paths.c
@@ -383,6 +383,7 @@ struct load_url_result *load_url_async(void *ctx, struct pb_url *url,
task->async = async_cb != NULL;
task->result = talloc_zero(ctx, struct load_url_result);
task->result->task = task;
+ task->result->url = url;
task->process = process_create(task);
if (task->async) {
task->async_cb = async_cb;
diff --git a/discover/paths.h b/discover/paths.h
index ed0e153..191b8dc 100644
--- a/discover/paths.h
+++ b/discover/paths.h
@@ -30,6 +30,7 @@ struct load_url_result {
LOAD_CANCELLED,
} status;
+ struct pb_url *url;
const char *local;
bool cleanup_local;
struct load_task *task;
diff --git a/test/parser/utils.c b/test/parser/utils.c
index 6bc7cc5..9d40d2b 100644
--- a/test/parser/utils.c
+++ b/test/parser/utils.c
@@ -353,6 +353,7 @@ struct load_url_result *load_url_async(void *ctx, struct pb_url *url,
return NULL;
result->local = talloc_strdup(result, tmp);
+ result->url = url;
if (rc < 0)
result->status = LOAD_ERROR;
else
OpenPOWER on IntegriCloud