import: simplify dkr importer, by making use of generic import-job logic, used by the raw and tar importers

This gets us progress output as well xz/bzip2 support.

1 files changed, 2 insertions, 4 deletions

diff --git a/src/import/import-dkr.h b/src/import/import-dkr.h
index 5f888765a8..b56d83f38f 100644
--- a/src/import/import-dkr.h
+++ b/src/import/import-dkr.h
@@ -24,17 +24,15 @@
 
 typedef struct DkrImport DkrImport;
 
-typedef void (*dkr_import_on_finished)(DkrImport *import, int error, void *userdata);
+typedef void (*DkrImportFinished)(DkrImport *import, int error, void *userdata);
 
-int dkr_import_new(DkrImport **import, sd_event *event, const char *index_url, const char *image_root, dkr_import_on_finished on_finished, void *userdata);
+int dkr_import_new(DkrImport **import, sd_event *event, const char *index_url, const char *image_root, DkrImportFinished on_finished, void *userdata);
 DkrImport* dkr_import_unref(DkrImport *import);
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(DkrImport*, dkr_import_unref);
 
 int dkr_import_pull(DkrImport *import, const char *name, const char *tag, const char *local, bool force_local);
-int dkr_import_cancel(DkrImport *import, const char *name);
 
 bool dkr_name_is_valid(const char *name);
 bool dkr_id_is_valid(const char *id);
 #define dkr_tag_is_valid(tag) filename_is_valid(tag)
-bool dkr_url_is_valid(const char *url);