X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpaths.h;h=191b8dc84c6a5debcfeb3333362898f1b0d31f5a;hp=93788e9d863fb7331535fcbec97df3ae72edb192;hb=1c3cb3b066bae9a981732d6ab868cee6df2136b4;hpb=ce1875fe6d550803879cad4ed168229e154c0d3c

diff --git a/discover/paths.h b/discover/paths.h
index 93788e9..191b8dc 100644
--- a/discover/paths.h
+++ b/discover/paths.h
@@ -16,12 +16,38 @@ char *join_paths(void *alloc_ctx, const char *a, const char *b);
  */
 const char *mount_base(void);
 
-typedef void (*load_url_callback)(void *data, int *status);
+struct load_task;
+
+struct load_url_result {
+	enum {
+		LOAD_OK,    /* load complete. other members should only be
+			       accessed if status == LOAD_OK */
+
+		LOAD_ERROR, /* only signalled to async loaders
+			     * (sync will see a NULL result) */
+
+		LOAD_ASYNC, /* async load still in progress */
+
+		LOAD_CANCELLED,
+	} status;
+	struct pb_url		*url;
+	const char		*local;
+	bool			cleanup_local;
+	struct load_task	*task;
+};
+
+/* callback type for asynchronous loads. The callback implementation is
+ * responsible for freeing result.
+ */
+typedef void (*load_url_complete)(struct load_url_result *result, void *data);
 
 /* Load a (potentially remote) file, and return a guaranteed-local name */
-char *load_url_async(void *ctx, struct pb_url *url, unsigned int *tempfile,
-		load_url_callback url_cb);
+struct load_url_result *load_url_async(void *ctx, struct pb_url *url,
+		load_url_complete complete, void *data);
+
+/* Cancel a pending load */
+void load_url_async_cancel(struct load_url_result *res);
 
-char *load_url(void *ctx, struct pb_url *url, unsigned int *tempfile);
+struct load_url_result *load_url(void *ctx, struct pb_url *url);
 
 #endif /* PATHS_H */