diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-01-21 23:47:37 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-01-22 00:39:30 -0500 |
| commit | 8facc3498ed037f842891ff55d1f60fe834f4ba0 (patch) | |
| tree | b0bfe51b9c233f985e6a17539b443f76ae413f0f | |
| parent | 213c305a2ff44c4b2ea7d0c96dd64be010ac797d (diff) | |
Fix some format strings for enums, they are signed
| -rw-r--r-- | src/journal/journal-file.c | 4 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-control.c | 6 | ||||
| -rw-r--r-- | src/libsystemd/sd-rtnl/rtnl-message.c | 2 | ||||
| -rw-r--r-- | src/shared/util.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index c1b54046f..ec12e891a 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -323,7 +323,7 @@ static int journal_file_verify_header(JournalFile *f) { } else if (state == STATE_ARCHIVED) return -ESHUTDOWN; else if (state != STATE_OFFLINE) { - log_debug("Journal file %s has unknown state %u.", f->path, state); + log_debug("Journal file %s has unknown state %i.", f->path, state); return -EBUSY; } } @@ -2417,7 +2417,7 @@ void journal_file_dump(JournalFile *f) { break; default: - printf("Type: unknown (%u)\n", o->object.type); + printf("Type: unknown (%i)\n", o->object.type); break; } diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c index 5dd2307f5..babfed8c2 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c @@ -1268,7 +1268,7 @@ int bus_add_match_internal_kernel( if (c->type - BUS_MATCH_ARG < 3) name_change_arg[c->type - BUS_MATCH_ARG] = c->value_str; - snprintf(buf, sizeof(buf), "arg%u", c->type - BUS_MATCH_ARG); + snprintf(buf, sizeof(buf), "arg%i", c->type - BUS_MATCH_ARG); bloom_add_pair(bloom, bus->bloom_size, bus->bloom_n_hash, buf, c->value_str); using_bloom = true; break; @@ -1277,7 +1277,7 @@ int bus_add_match_internal_kernel( case BUS_MATCH_ARG_PATH...BUS_MATCH_ARG_PATH_LAST: { char buf[sizeof("arg")-1 + 2 + sizeof("-slash-prefix")]; - snprintf(buf, sizeof(buf), "arg%u-slash-prefix", c->type - BUS_MATCH_ARG_PATH); + snprintf(buf, sizeof(buf), "arg%i-slash-prefix", c->type - BUS_MATCH_ARG_PATH); bloom_add_pair(bloom, bus->bloom_size, bus->bloom_n_hash, buf, c->value_str); using_bloom = true; break; @@ -1286,7 +1286,7 @@ int bus_add_match_internal_kernel( case BUS_MATCH_ARG_NAMESPACE...BUS_MATCH_ARG_NAMESPACE_LAST: { char buf[sizeof("arg")-1 + 2 + sizeof("-dot-prefix")]; - snprintf(buf, sizeof(buf), "arg%u-dot-prefix", c->type - BUS_MATCH_ARG_NAMESPACE); + snprintf(buf, sizeof(buf), "arg%i-dot-prefix", c->type - BUS_MATCH_ARG_NAMESPACE); bloom_add_pair(bloom, bus->bloom_size, bus->bloom_n_hash, buf, c->value_str); using_bloom = true; break; diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c index 06a7a4b83..484613351 100644 --- a/src/libsystemd/sd-rtnl/rtnl-message.c +++ b/src/libsystemd/sd-rtnl/rtnl-message.c @@ -1476,7 +1476,7 @@ int socket_read_message(sd_rtnl *rtnl) { r = type_system_get_type(NULL, &nl_type, new_msg->nlmsg_type); if (r < 0) { if (r == -ENOTSUP) - log_debug("sd-rtnl: ignored message with unknown type: %u", + log_debug("sd-rtnl: ignored message with unknown type: %i", new_msg->nlmsg_type); continue; diff --git a/src/shared/util.h b/src/shared/util.h index fa16d5252..2d03ac8fd 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -380,7 +380,7 @@ static inline uint32_t random_u32(void) { if (!s) \ return log_oom(); \ } else { \ - r = asprintf(&s, "%u", i); \ + r = asprintf(&s, "%i", i); \ if (r < 0) \ return log_oom(); \ } \ |