diff options
author | David Tardon <dtardon@redhat.com> | 2022-08-09 14:35:15 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2022-09-13 08:13:27 +0200 |
commit | 995340074e554b4bf4a0fdb0cb7436692c5a4ffd (patch) | |
tree | ca3ee001db3e608ee80478f42fea9c3b409f1b7b /src/journal-remote/journal-upload.c | |
parent | 6d64cb0625691e2b9eda8babe07ac8281f9467ee (diff) | |
download | systemd-995340074e554b4bf4a0fdb0cb7436692c5a4ffd.tar.gz |
tree-wide: use ASSERT_PTR more
Diffstat (limited to 'src/journal-remote/journal-upload.c')
-rw-r--r-- | src/journal-remote/journal-upload.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index 2ad175c248..06448b2225 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -79,9 +79,7 @@ static size_t output_callback(char *buf, size_t size, size_t nmemb, void *userp) { - Uploader *u = userp; - - assert(u); + Uploader *u = ASSERT_PTR(userp); log_debug("The server answers (%zu bytes): %.*s", size*nmemb, (int)(size*nmemb), buf); @@ -291,10 +289,9 @@ int start_upload(Uploader *u, } static size_t fd_input_callback(void *buf, size_t size, size_t nmemb, void *userp) { - Uploader *u = userp; + Uploader *u = ASSERT_PTR(userp); ssize_t n; - assert(u); assert(nmemb < SSIZE_MAX / size); if (u->input < 0) @@ -329,9 +326,8 @@ static int dispatch_fd_input(sd_event_source *event, int fd, uint32_t revents, void *userp) { - Uploader *u = userp; + Uploader *u = ASSERT_PTR(userp); - assert(u); assert(fd >= 0); if (revents & EPOLLHUP) { @@ -384,9 +380,7 @@ static int open_file_for_upload(Uploader *u, const char *filename) { static int dispatch_sigterm(sd_event_source *event, const struct signalfd_siginfo *si, void *userdata) { - Uploader *u = userdata; - - assert(u); + Uploader *u = ASSERT_PTR(userdata); log_received_signal(LOG_INFO, si); @@ -540,13 +534,12 @@ static int config_parse_path_or_ignore( _cleanup_free_ char *n = NULL; bool fatal = ltype; - char **s = data; + char **s = ASSERT_PTR(data); int r; assert(filename); assert(lvalue); assert(rvalue); - assert(data); if (isempty(rvalue)) goto finalize; |