tree-wide: use ASSERT_PTR more

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

diff --git a/src/import/pull-job.c b/src/import/pull-job.c
index f5eb82131e4bd7b99772afc10a5fbd4b0539826d..1e105bc769f71eb5cbd1b8194bcd7f3af22b2c03 100644 (file)
--- a/src/import/pull-job.c
+++ b/src/import/pull-job.c
@@ -303,11 +303,10 @@ finish:
 }
 
 static int pull_job_write_uncompressed(const void *p, size_t sz, void *userdata) {
-        PullJob *j = userdata;
+        PullJob *j = ASSERT_PTR(userdata);
         bool too_much = false;
         int r;
 
-        assert(j);
         assert(p);
         assert(sz > 0);
 
@@ -480,12 +479,11 @@ static int pull_job_detect_compression(PullJob *j) {
 }
 
 static size_t pull_job_write_callback(void *contents, size_t size, size_t nmemb, void *userdata) {
-        PullJob *j = userdata;
+        PullJob *j = ASSERT_PTR(userdata);
         size_t sz = size * nmemb;
         int r;
 
         assert(contents);
-        assert(j);
 
         switch (j->state) {
 
@@ -543,13 +541,12 @@ static int http_status_etag_exists(CURLcode status) {
 static size_t pull_job_header_callback(void *contents, size_t size, size_t nmemb, void *userdata) {
         _cleanup_free_ char *length = NULL, *last_modified = NULL, *etag = NULL;
         size_t sz = size * nmemb;
-        PullJob *j = userdata;
+        PullJob *j = ASSERT_PTR(userdata);
         CURLcode code;
         long status;
         int r;
 
         assert(contents);
-        assert(j);
 
         if (IN_SET(j->state, PULL_JOB_DONE, PULL_JOB_FAILED)) {
                 r = -ESTALE;
@@ -634,12 +631,10 @@ fail:
 }
 
 static int pull_job_progress_callback(void *userdata, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow) {
-        PullJob *j = userdata;
+        PullJob *j = ASSERT_PTR(userdata);
         unsigned percent;
         usec_t n;
 
-        assert(j);
-
         if (dltotal <= 0)
                 return 0;