picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix some format strings for enums, they are signed

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-01-21 23:47:37 -05:00
parent 213c305a2f
commit 8facc3498e
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/journal/journal-file.c
View file

@ -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;
}

6
src/libsystemd/sd-bus/bus-control.c
View file

@ -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;

2
src/libsystemd/sd-rtnl/rtnl-message.c
View file

@ -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;

2
src/shared/util.h
View file

@ -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(); \
} \