tree-wide: use ASSERT_PTR more

[thirdparty/systemd.git] / src / journal-remote / journal-upload-journal.c

diff --git a/src/journal-remote/journal-upload-journal.c b/src/journal-remote/journal-upload-journal.c
index cf9c760202781a3f48557b7de860d8e06d23bb45..7a8f50dd0df0578018173205c9074ca3870f1f82 100644 (file)
--- a/src/journal-remote/journal-upload-journal.c
+++ b/src/journal-remote/journal-upload-journal.c
@@ -251,13 +251,12 @@ static void check_update_watchdog(Uploader *u) {
 }
 
 static size_t journal_input_callback(void *buf, size_t size, size_t nmemb, void *userp) {
-        Uploader *u = userp;
+        Uploader *u = ASSERT_PTR(userp);
         int r;
         sd_journal *j;
         size_t filled = 0;
         ssize_t w;
 
-        assert(u);
         assert(nmemb <= SSIZE_MAX / size);
 
         check_update_watchdog(u);
@@ -356,9 +355,7 @@ static int dispatch_journal_input(sd_event_source *event,
                                   int fd,
                                   uint32_t revents,
                                   void *userp) {
-        Uploader *u = userp;
-
-        assert(u);
+        Uploader *u = ASSERT_PTR(userp);
 
         if (u->uploading)
                 return 0;