summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2019-12-10 11:52:54 +0100
committerLennart Poettering <lennart@poettering.net>2019-12-10 11:56:18 +0100
commit5905d7cf5bc8986a7cfe7076d9724c06c79f178f (patch)
treee69ff5cf824438674423f439caf52ede256fd1fb
parentb5ea030d65e9af87a57155bf269fee21a5282bf7 (diff)
downloadsystemd-5905d7cf5bc8986a7cfe7076d9724c06c79f178f.tar.gz
tree-wide: use SD_ID128_STRING_MAX where appropriate
-rw-r--r--src/journal-remote/journal-upload-journal.c2
-rw-r--r--src/journal/journal-file.c2
-rw-r--r--src/journal/sd-journal.c2
-rw-r--r--src/libsystemd/sd-bus/sd-bus.c2
-rw-r--r--src/nspawn/nspawn.c2
-rw-r--r--src/shared/logs-show.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/journal-remote/journal-upload-journal.c b/src/journal-remote/journal-upload-journal.c
index 7d7e7384bf..5bfe5acadc 100644
--- a/src/journal-remote/journal-upload-journal.c
+++ b/src/journal-remote/journal-upload-journal.c
@@ -103,7 +103,7 @@ static ssize_t write_entry(char *buf, size_t size, Uploader *u) {
_fallthrough_;
case ENTRY_BOOT_ID: {
sd_id128_t boot_id;
- char sid[33];
+ char sid[SD_ID128_STRING_MAX];
r = sd_journal_get_monotonic_usec(u->journal, NULL, &boot_id);
if (r < 0)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index e1cd080c64..505191999b 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -3056,7 +3056,7 @@ static const char* format_timestamp_safe(char *buf, size_t l, usec_t t) {
}
void journal_file_print_header(JournalFile *f) {
- char a[33], b[33], c[33], d[33];
+ char a[SD_ID128_STRING_MAX], b[SD_ID128_STRING_MAX], c[SD_ID128_STRING_MAX], d[SD_ID128_STRING_MAX];
char x[FORMAT_TIMESTAMP_MAX], y[FORMAT_TIMESTAMP_MAX], z[FORMAT_TIMESTAMP_MAX];
struct stat st;
char bytes[FORMAT_BYTES_MAX];
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 2b969a6405..358f2fd738 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -908,7 +908,7 @@ _public_ int sd_journal_previous_skip(sd_journal *j, uint64_t skip) {
_public_ int sd_journal_get_cursor(sd_journal *j, char **cursor) {
Object *o;
int r;
- char bid[33], sid[33];
+ char bid[SD_ID128_STRING_MAX], sid[SD_ID128_STRING_MAX];
assert_return(j, -EINVAL);
assert_return(!journal_pid_changed(j), -ECHILD);
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 058492a83e..b53d4dd854 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -2672,7 +2672,7 @@ static int process_builtin(sd_bus *bus, sd_bus_message *m) {
r = sd_bus_message_new_method_return(m, &reply);
else if (streq_ptr(m->member, "GetMachineId")) {
sd_id128_t id;
- char sid[33];
+ char sid[SD_ID128_STRING_MAX];
r = sd_id128_get_machine(&id);
if (r < 0)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index d1ad8a37c8..00adbcb61a 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -2229,9 +2229,9 @@ static int setup_hostname(void) {
static int setup_journal(const char *directory) {
_cleanup_free_ char *d = NULL;
+ char id[SD_ID128_STRING_MAX];
const char *dirname, *p, *q;
sd_id128_t this_id;
- char id[33];
bool try;
int r;
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 27b8ccd5e4..ce0a4acf9c 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -655,7 +655,7 @@ static int output_export(
const size_t highlight[2]) {
sd_id128_t boot_id;
- char sid[33];
+ char sid[SD_ID128_STRING_MAX];
int r;
usec_t realtime, monotonic;
_cleanup_free_ char *cursor = NULL;