Merge pull request #2495 from heftig/master

[thirdparty/systemd.git] / src / import / pull-common.c

diff --git a/src/import/pull-common.c b/src/import/pull-common.c
index f465154b1d400f1d6c39d99011cfefd4a285f81c..d301d4d79e60bf4434e6d2e088eb346e2605de3a 100644 (file)
--- a/src/import/pull-common.c
+++ b/src/import/pull-common.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
@@ -21,12 +19,15 @@
 
 #include <sys/prctl.h>
 
+#include "alloc-util.h"
 #include "btrfs-util.h"
-#include "capability.h"
+#include "capability-util.h"
 #include "copy.h"
+#include "dirent-util.h"
 #include "escape.h"
 #include "fd-util.h"
 #include "io-util.h"
+#include "path-util.h"
 #include "process-util.h"
 #include "pull-common.h"
 #include "pull-job.h"
@@ -36,6 +37,7 @@
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
+#include "web-util.h"
 
 #define FILENAME_ESCAPE "/.#\"\'"
 #define HASH_URL_THRESHOLD_LENGTH (_POSIX_PATH_MAX - 16)
@@ -161,7 +163,7 @@ static int hash_url(const char *url, char **ret) {
 
         assert(url);
 
-        siphash24((uint8_t *) &h, url, strlen(url), k.bytes);
+        h = siphash24(url, strlen(url), k.bytes);
         if (asprintf(ret, "%"PRIx64, h) < 0)
                 return -ENOMEM;