X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fimport%2Fimport-raw.h;h=ae2c29991ff69401ecec6d3fe699eaee49bc39ff;hb=6cb8e687f038424ef54b5c5c3c433be974fbe371;hp=5a38cdcc9e58c91889f07b42bbf801393ef81828;hpb=aceac2f0b652dff701e5815c51c2e372e8fee84d;p=elogind.git

diff --git a/src/import/import-raw.h b/src/import/import-raw.h
index 5a38cdcc9..ae2c29991 100644
--- a/src/import/import-raw.h
+++ b/src/import/import-raw.h
@@ -1,5 +1,7 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
+#pragma once
+
 /***
   This file is part of systemd.
 
@@ -20,18 +22,16 @@
 ***/
 
 #include "sd-event.h"
-#include "util.h"
+#include "macro.h"
+#include "import-util.h"
 
 typedef struct RawImport RawImport;
 
-typedef void (*raw_import_on_finished)(RawImport *import, int error, void *userdata);
+typedef void (*RawImportFinished)(RawImport *import, int error, void *userdata);
 
-int raw_import_new(RawImport **import, sd_event *event, const char *image_root, raw_import_on_finished on_finished, void *userdata);
+int raw_import_new(RawImport **import, sd_event *event, const char *image_root, RawImportFinished on_finished, void *userdata);
 RawImport* raw_import_unref(RawImport *import);
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(RawImport*, raw_import_unref);
 
-int raw_import_pull(RawImport *import, const char *url, const char *local, bool force_local);
-int raw_import_cancel(RawImport *import, const char *name);
-
-bool raw_url_is_valid(const char *url);
+int raw_import_pull(RawImport *import, const char *url, const char *local, bool force_local, ImportVerify verify);