From: Daniel Mack <daniel@zonque.org>
Date: Thu, 21 Jan 2016 15:35:19 +0000 (+0100)
Subject: sysusers: use GID_FMT and UID_FMT instead of %d
X-Git-Tag: v229~100^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dda65f56ff343fb63c6f5c9dbde1a88b22c0c41b;p=thirdparty%2Fsystemd.git

sysusers: use GID_FMT and UID_FMT instead of %d
---

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 90a2111ec59..b1dd7e19134 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -416,7 +416,7 @@ static int write_files(void) {
                                 }
 
                                 if (hashmap_contains(todo_gids, GID_TO_PTR(gr->gr_gid))) {
-                                        log_error("%s: Detected collision for GID %d.", group_path, gr->gr_gid);
+                                        log_error("%s: Detected collision for GID " GID_FMT ".", group_path, gr->gr_gid);
                                         r = -EEXIST;
                                         goto finish;
                                 }
@@ -557,7 +557,7 @@ static int write_files(void) {
                                 }
 
                                 if (hashmap_contains(todo_uids, UID_TO_PTR(pw->pw_uid))) {
-                                        log_error("%s: Detected collision for UID %d.", passwd_path, pw->pw_uid);
+                                        log_error("%s: Detected collision for UID " UID_FMT ".", passwd_path, pw->pw_uid);
                                         r = -EEXIST;
                                         goto finish;
                                 }