From: tblume <Thomas.Blume@suse.com>
Date: Wed, 26 Apr 2017 00:37:07 +0000 (+0200)
Subject: importd: support SUSE style checksums supplementary (#5800)
X-Git-Tag: v234~281
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f0f4f3bfd05fd416e3e2dea10ad225b276a6ef7;p=thirdparty%2Fsystemd.git

importd: support SUSE style checksums supplementary (#5800)

some small changes to make the code look better
---

diff --git a/src/import/pull-job.c b/src/import/pull-job.c
index 8eabb09eed2..320c21305ad 100644
--- a/src/import/pull-job.c
+++ b/src/import/pull-job.c
@@ -22,15 +22,15 @@
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "hexdecoct.h"
+#include "import-util.h"
 #include "io-util.h"
 #include "machine-pool.h"
 #include "parse-util.h"
+#include "pull-common.h"
 #include "pull-job.h"
 #include "string-util.h"
 #include "strv.h"
 #include "xattr-util.h"
-#include "pull-common.h"
-#include "import-util.h"
 
 PullJob* pull_job_unref(PullJob *j) {
         if (!j)
@@ -84,10 +84,9 @@ static int pull_job_restart(PullJob *j) {
                 return r;
 
         free(j->url);
-        free(j->payload);
         j->url = chksum_url;
         j->state = PULL_JOB_INIT;
-        j->payload = NULL;
+        j->payload = mfree(j->payload);
         j->payload_size = 0;
         j->payload_allocated = 0;
         j->written_compressed = 0;
@@ -101,7 +100,6 @@ static int pull_job_restart(PullJob *j) {
         return 0;
 }
 
-
 void pull_job_curl_on_finished(CurlGlue *g, CURL *curl, CURLcode result) {
         PullJob *j = NULL;
         CURLcode code;