emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Use 'uintmax_t' to print 'gid_t'

Browse Source 
This is shorter to write than 'unsigned long int', so we can collapse
some lines.  It is guaranteed by C99.

Link: <https://github.com/shadow-maint/shadow/pull/607>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
Alejandro Colomar 2022-12-16 01:06:09 +01:00 committed by Iker Pedrosa
parent 587ce83e3f
commit 06c30450ce
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/groupmod.c
View File

@ -15,6 +15,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <getopt.h> #include <getopt.h>
#include <grp.h> #include <grp.h>
#include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#ifdef ACCT_TOOLS_SETUID #ifdef ACCT_TOOLS_SETUID
@ -574,8 +575,7 @@ static void prepare_failure_reports (void)
(void) snprintf (info_group.action, (void) snprintf (info_group.action,
512 - strlen (info_group.audit_msg), 512 - strlen (info_group.audit_msg),
"group %s/%lu", "group %s/%ju", group_name, (uintmax_t) group_id);
group_name, (unsigned long int) group_id);
#ifdef SHADOWGRP #ifdef SHADOWGRP
(void) snprintf (info_gshadow.action, (void) snprintf (info_gshadow.action,
512 - strlen (info_group.audit_msg), 512 - strlen (info_group.audit_msg),
@ -583,8 +583,7 @@ static void prepare_failure_reports (void)
#endif #endif
(void) snprintf (info_passwd.action, (void) snprintf (info_passwd.action,
512 - strlen (info_group.audit_msg), 512 - strlen (info_group.audit_msg),
"group %s/%lu", "group %s/%ju", group_name, (uintmax_t) group_id);
group_name, (unsigned long int) group_id);
if (nflg) { if (nflg) {
strncat (info_group.action, ", new name: ", strncat (info_group.action, ", new name: ",
@ -618,13 +617,13 @@ static void prepare_failure_reports (void)
511 - strlen (info_group.audit_msg)); 511 - strlen (info_group.audit_msg));
(void) snprintf (info_group.action+strlen (info_group.action), (void) snprintf (info_group.action+strlen (info_group.action),
512 - strlen (info_group.audit_msg), 512 - strlen (info_group.audit_msg),
"%lu", (unsigned long int) group_newid); "%ju", (uintmax_t) group_newid);
strncat (info_passwd.action, ", new gid: ", strncat (info_passwd.action, ", new gid: ",
511 - strlen (info_passwd.audit_msg)); 511 - strlen (info_passwd.audit_msg));
(void) snprintf (info_passwd.action+strlen (info_passwd.action), (void) snprintf (info_passwd.action+strlen (info_passwd.action),
512 - strlen (info_passwd.audit_msg), 512 - strlen (info_passwd.audit_msg),
"%lu", (unsigned long int) group_newid); "%ju", (uintmax_t) group_newid);
} }
info_group.audit_msg[511] = '\0'; info_group.audit_msg[511] = '\0';
#ifdef SHADOWGRP #ifdef SHADOWGRP