chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ee407ee
)
loginctl: drop casts in printf
author
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Sun, 16 Oct 2016 18:19:06 +0000
(14:19 -0400)
committer
Sven Eden
<yamakuzure@gmx.net>
Wed, 5 Jul 2017 06:50:55 +0000
(08:50 +0200)
src/login/loginctl.c
patch
|
blob
|
history
diff --git
a/src/login/loginctl.c
b/src/login/loginctl.c
index 2eeaf0b9ef0586fdf46f2d57b89d03b28d5e2d8e..f3a0c4247ce358f47df902a0a3998b69fa2acea2 100644
(file)
--- a/
src/login/loginctl.c
+++ b/
src/login/loginctl.c
@@
-133,7
+133,7
@@
static int list_sessions(int argc, char *argv[], void *userdata) {
printf("%10s %10s %-16s %-16s\n", "SESSION", "UID", "USER", "SEAT");
while ((r = sd_bus_message_read(reply, "(susso)", &id, &uid, &user, &seat, &object)) > 0) {
printf("%10s %10s %-16s %-16s\n", "SESSION", "UID", "USER", "SEAT");
while ((r = sd_bus_message_read(reply, "(susso)", &id, &uid, &user, &seat, &object)) > 0) {
- printf("%10s %10
u %-16s %-16s\n", id, (unsigned)
uid, user, seat);
+ printf("%10s %10
"PRIu32" %-16s %-16s\n", id,
uid, user, seat);
k++;
}
if (r < 0)
k++;
}
if (r < 0)
@@
-180,7
+180,7
@@
static int list_users(int argc, char *argv[], void *userdata) {
printf("%10s %-16s\n", "UID", "USER");
while ((r = sd_bus_message_read(reply, "(uso)", &uid, &user, &object)) > 0) {
printf("%10s %-16s\n", "UID", "USER");
while ((r = sd_bus_message_read(reply, "(uso)", &uid, &user, &object)) > 0) {
- printf("%10
u %-16s\n", (unsigned)
uid, user);
+ printf("%10
"PRIu32" %-16s\n",
uid, user);
k++;
}
if (r < 0)
k++;
}
if (r < 0)
@@
-479,9
+479,9
@@
static int print_session_status_info(sd_bus *bus, const char *path, bool *new_li
printf("%s - ", strna(i.id));
if (i.name)
printf("%s - ", strna(i.id));
if (i.name)
- printf("%s (%
u)\n", i.name, (unsigned)
i.uid);
+ printf("%s (%
"PRIu32")\n", i.name,
i.uid);
else
else
- printf("%
u\n", (unsigned)
i.uid);
+ printf("%
"PRIu32"\n",
i.uid);
s1 = format_timestamp_relative(since1, sizeof(since1), i.timestamp.realtime);
s2 = format_timestamp(since2, sizeof(since2), i.timestamp.realtime);
s1 = format_timestamp_relative(since1, sizeof(since1), i.timestamp.realtime);
s2 = format_timestamp(since2, sizeof(since2), i.timestamp.realtime);
@@
-494,7
+494,7
@@
static int print_session_status_info(sd_bus *bus, const char *path, bool *new_li
if (i.leader > 0) {
_cleanup_free_ char *t = NULL;
if (i.leader > 0) {
_cleanup_free_ char *t = NULL;
- printf("\t Leader: %
u", (unsigned)
i.leader);
+ printf("\t Leader: %
"PRIu32,
i.leader);
get_process_comm(i.leader, &t);
if (t)
get_process_comm(i.leader, &t);
if (t)
@@
-608,9
+608,9
@@
static int print_user_status_info(sd_bus *bus, const char *path, bool *new_line)
*new_line = true;
if (i.name)
*new_line = true;
if (i.name)
- printf("%s (%
u)\n", i.name, (unsigned)
i.uid);
+ printf("%s (%
"PRIu32")\n", i.name,
i.uid);
else
else
- printf("%
u\n", (unsigned)
i.uid);
+ printf("%
"PRIu32"\n",
i.uid);
s1 = format_timestamp_relative(since1, sizeof(since1), i.timestamp.realtime);
s2 = format_timestamp(since2, sizeof(since2), i.timestamp.realtime);
s1 = format_timestamp_relative(since1, sizeof(since1), i.timestamp.realtime);
s2 = format_timestamp(since2, sizeof(since2), i.timestamp.realtime);