diff options
Diffstat (limited to 'src/journal-remote')
-rw-r--r-- | src/journal-remote/journal-gatewayd.c | 19 | ||||
-rw-r--r-- | src/journal-remote/journal-remote-main.c | 4 | ||||
-rw-r--r-- | src/journal-remote/journal-upload-journal.c | 7 | ||||
-rw-r--r-- | src/journal-remote/journal-upload.c | 17 |
4 files changed, 14 insertions, 33 deletions
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c index 8fb07bc02f..cdfeb1fc80 100644 --- a/src/journal-remote/journal-gatewayd.c +++ b/src/journal-remote/journal-gatewayd.c @@ -147,11 +147,10 @@ static ssize_t request_reader_entries( char *buf, size_t max) { - RequestMeta *m = cls; + RequestMeta *m = ASSERT_PTR(cls); int r; size_t n, k; - assert(m); assert(buf); assert(max > 0); assert(pos >= m->delta); @@ -359,12 +358,10 @@ static mhd_result request_parse_arguments_iterator( const char *key, const char *value) { - RequestMeta *m = cls; + RequestMeta *m = ASSERT_PTR(cls); _cleanup_free_ char *p = NULL; int r; - assert(m); - if (isempty(key)) { m->argument_parse_error = -EINVAL; return MHD_NO; @@ -467,11 +464,10 @@ static int request_handler_entries( void *connection_cls) { _cleanup_(MHD_destroy_responsep) struct MHD_Response *response = NULL; - RequestMeta *m = connection_cls; + RequestMeta *m = ASSERT_PTR(connection_cls); int r; assert(connection); - assert(m); r = open_journal(m); if (r < 0) @@ -541,11 +537,10 @@ static ssize_t request_reader_fields( char *buf, size_t max) { - RequestMeta *m = cls; + RequestMeta *m = ASSERT_PTR(cls); int r; size_t n, k; - assert(m); assert(buf); assert(max > 0); assert(pos >= m->delta); @@ -616,11 +611,10 @@ static int request_handler_fields( void *connection_cls) { _cleanup_(MHD_destroy_responsep) struct MHD_Response *response = NULL; - RequestMeta *m = connection_cls; + RequestMeta *m = ASSERT_PTR(connection_cls); int r; assert(connection); - assert(m); r = open_journal(m); if (r < 0) @@ -734,7 +728,7 @@ static int request_handler_machine( void *connection_cls) { _cleanup_(MHD_destroy_responsep) struct MHD_Response *response = NULL; - RequestMeta *m = connection_cls; + RequestMeta *m = ASSERT_PTR(connection_cls); int r; _cleanup_free_ char* hostname = NULL, *os_name = NULL; uint64_t cutoff_from = 0, cutoff_to = 0, usage = 0; @@ -742,7 +736,6 @@ static int request_handler_machine( _cleanup_free_ char *v = NULL, *json = NULL; assert(connection); - assert(m); r = open_journal(m); if (r < 0) diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c index 4fe5812d2f..0088652184 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -530,12 +530,10 @@ static int dispatch_http_event(sd_event_source *event, int fd, uint32_t revents, void *userdata) { - MHDDaemonWrapper *d = userdata; + MHDDaemonWrapper *d = ASSERT_PTR(userdata); int r; MHD_UNSIGNED_LONG_LONG timeout = ULLONG_MAX; - assert(d); - r = MHD_run(d->daemon); if (r == MHD_NO) // FIXME: unregister daemon diff --git a/src/journal-remote/journal-upload-journal.c b/src/journal-remote/journal-upload-journal.c index cf9c760202..7a8f50dd0d 100644 --- 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; 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; |