importd: support SUSE style checksums supplementary (#5800)

some small changes to make the code look better
This commit is contained in:
tblume 2017-04-26 02:37:07 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent c0e7906d20
commit 1f0f4f3bfd
1 changed files with 3 additions and 5 deletions

View File

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