X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fimport%2Fimport-common.h;fp=src%2Fimport%2Fimport-util.h;h=39ac6acd08772dab2371ecd0228afd8aa484f459;hb=3d7415f43f0fe6a821d7bc4a341ba371e8a30ef3;hp=6c63fc32a4aec38990cf23727fee7308c342e41e;hpb=f4c135bf2f0abcf79c89efbeae51f03bacba5f2f;p=elogind.git

diff --git a/src/import/import-util.h b/src/import/import-common.h
similarity index 75%
rename from src/import/import-util.h
rename to src/import/import-common.h
index 6c63fc32a..39ac6acd0 100644
--- a/src/import/import-util.h
+++ b/src/import/import-common.h
@@ -24,16 +24,7 @@
 #include <stdbool.h>
 
 #include "import-job.h"
-
-typedef enum ImportVerify {
-        IMPORT_VERIFY_NO,
-        IMPORT_VERIFY_SUM,
-        IMPORT_VERIFY_SIGNATURE,
-        _IMPORT_VERIFY_MAX,
-        _IMPORT_VERIFY_INVALID = -1,
-} ImportVerify;
-
-bool http_etag_is_valid(const char *etag);
+#include "import-util.h"
 
 int import_make_local_copy(const char *final, const char *root, const char *local, bool force_local);
 
@@ -44,11 +35,5 @@ int import_make_read_only(const char *path);
 
 int import_make_path(const char *url, const char *etag, const char *image_root, const char *prefix, const char *suffix, char **ret);
 
-int import_url_last_component(const char *url, char **ret);
-int import_url_change_last_component(const char *url, const char *suffix, char **ret);
-
-const char* import_verify_to_string(ImportVerify v) _const_;
-ImportVerify import_verify_from_string(const char *s) _pure_;
-
 int import_make_verification_jobs(ImportJob **ret_checksum_job, ImportJob **ret_signature_job, ImportVerify verify, const char *url, CurlGlue *glue, ImportJobFinished on_finished, void *userdata);
 int import_verify(ImportJob *main_job, ImportJob *checksum_job, ImportJob *signature_job);