fetch() now knows nothing about struct image; it simply loads a file and

returns the allocated buffer.

src/include/gpxe/image.h

@@ -31,14 +31,6 @@ struct image {
 	userptr_t data;
 	/** Length of raw file image */
 	size_t len;
-	/**
-	 * Free raw file image
-	 *
-	 * @v data		Raw file image
-	 *
-	 * Call this method before freeing up the @c struct @c image.
-	 */
-	void ( * free ) ( userptr_t data );
 
 	/** Entry point */
 	physaddr_t entry;

src/include/usr/fetch.h

@@ -4,10 +4,13 @@
 /**
  * @file
  *
- * Fetch file as executable/loadable image
+ * Fetch file
  *
  */
 
-extern int fetch ( struct image *image, const char *filename );
+#include <stdint.h>
+#include <gpxe/uaccess.h>
+
+extern int fetch ( const char *filename, userptr_t *data, size_t *len );
 
 #endif /* _USR_FETCH_H */