diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-01-20 22:22:15 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-01-22 01:14:52 -0500 |
| commit | 1fa2f38f0f011010bf57522b42fcc168856a7003 (patch) | |
| tree | 7bd1a23716379826ef6cd37f98c2f02470a2d5c4 /src/journal-remote | |
| parent | 8facc3498ed037f842891ff55d1f60fe834f4ba0 (diff) | |
Assorted format fixes
Types used for pids and uids in various interfaces are unpredictable.
Too bad.
Diffstat (limited to 'src/journal-remote')
| -rw-r--r-- | src/journal-remote/journal-remote-parse.c | 10 | ||||
| -rw-r--r-- | src/journal-remote/journal-remote.c | 2 | ||||
| -rw-r--r-- | src/journal-remote/journal-upload.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c index 76407f711b..d9dea8deb0 100644 --- a/src/journal-remote/journal-remote-parse.c +++ b/src/journal-remote/journal-remote-parse.c @@ -37,7 +37,7 @@ void source_free(RemoteSource *source) { free(source->buf); iovw_free_contents(&source->iovw); - log_debug("Writer ref count %u", source->writer->n_ref); + log_debug("Writer ref count %i", source->writer->n_ref); writer_unref(source->writer); sd_event_source_unref(source->event); @@ -125,8 +125,8 @@ static int get_line(RemoteSource *source, char **line, size_t *size) { source->size - source->filled); if (n < 0) { if (errno != EAGAIN && errno != EWOULDBLOCK) - log_error_errno(errno, "read(%d, ..., %zd): %m", source->fd, - source->size - source->filled); + log_error_errno(errno, "read(%d, ..., %zu): %m", source->fd, + source->size - source->filled); return -errno; } else if (n == 0) return 0; @@ -186,8 +186,8 @@ static int fill_fixed_size(RemoteSource *source, void **data, size_t size) { source->size - source->filled); if (n < 0) { if (errno != EAGAIN && errno != EWOULDBLOCK) - log_error_errno(errno, "read(%d, ..., %zd): %m", source->fd, - source->size - source->filled); + log_error_errno(errno, "read(%d, ..., %zu): %m", source->fd, + source->size - source->filled); return -errno; } else if (n == 0) return 0; diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index 5050616d84..244d83d363 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -1021,7 +1021,7 @@ static int dispatch_raw_source_event(sd_event_source *event, if (remaining > 0) log_warning("Premature EOF. %zu bytes lost.", remaining); remove_source(s, source->fd); - log_info("%zd active sources remaining", s->active); + log_info("%zu active sources remaining", s->active); return 0; } else if (r == -E2BIG) { log_error("Entry too big, skipped"); diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index 50332edcc7..75bb434c08 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -296,7 +296,7 @@ static size_t fd_input_callback(void *buf, size_t size, size_t nmemb, void *user return 0; r = read(u->input, buf, size * nmemb); - log_debug("%s: allowed %zu, read %zu", __func__, size*nmemb, r); + log_debug("%s: allowed %zu, read %zd", __func__, size*nmemb, r); if (r > 0) return r; @@ -505,15 +505,15 @@ static int perform_upload(Uploader *u) { } if (status >= 300) { - log_error("Upload to %s failed with code %lu: %s", + log_error("Upload to %s failed with code %ld: %s", u->url, status, strna(u->answer)); return -EIO; } else if (status < 200) { - log_error("Upload to %s finished with unexpected code %lu: %s", + log_error("Upload to %s finished with unexpected code %ld: %s", u->url, status, strna(u->answer)); return -EIO; } else - log_debug("Upload finished successfully with code %lu: %s", + log_debug("Upload finished successfully with code %ld: %s", status, strna(u->answer)); free(u->last_cursor); |