printsiginfo: fix printing of siginfo_t.si_pid and siginfo_t.si_uid

* printsiginfo.c (printsigsource): Print siginfo_t.si_pid using
PRINT_FIELD_D, print siginfo_t.si_uid using PRINT_FIELD_UID.
* tests/clone_ptrace.c (main): Update expected output.
* tests/orphaned_process_group.c (main): Likewise.
* tests/pidfd_send_signal.c (main): Likewise.
* tests/ptrace.c (test_peeksiginfo): Likewise.
* tests/rt_sigqueueinfo.c (main): Likewise.
* tests/rt_tgsigqueueinfo.c (main): Likewise.
* tests/siginfo.c (main): Likewise.
* tests/waitid.c (sprint_siginfo): Likewise.

9 files changed, 21 insertions, 22 deletions

diff --git a/printsiginfo.c b/printsiginfo.c
index 133bc24de..0a9932d99 100644
--- a/printsiginfo.c
+++ b/printsiginfo.c
@@ -58,9 +58,8 @@
 static void
 printsigsource(const siginfo_t *sip)
 {
-	tprintf(", si_pid=%u, si_uid=%u",
-		(unsigned int) sip->si_pid,
-		(unsigned int) sip->si_uid);
+	PRINT_FIELD_D(", ", *sip, si_pid);
+	PRINT_FIELD_UID(", ", *sip, si_uid);
 }
 
 static void
diff --git a/tests/clone_ptrace.c b/tests/clone_ptrace.c
index d0e070ecd..4598400da 100644
--- a/tests/clone_ptrace.c
+++ b/tests/clone_ptrace.c
@@ -96,7 +96,7 @@ main(void)
 		error_msg_and_fail("unexpected child exit status %d", status);
 
 	printf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_KILLED, si_pid=%d"
-	       ", si_uid=%u, si_status=%s, si_utime=%u, si_stime=%u} ---\n"
+	       ", si_uid=%d, si_status=%s, si_utime=%u, si_stime=%u} ---\n"
 #if !QUIET_EXIT
 	       "+++ exited with 0 +++\n"
 #endif
diff --git a/tests/orphaned_process_group.c b/tests/orphaned_process_group.c
index 83ab6e391..eed57aa6b 100644
--- a/tests/orphaned_process_group.c
+++ b/tests/orphaned_process_group.c
@@ -139,7 +139,7 @@ main(void)
 	 */
 	leader = getpid();
 	printf("%-5d --- %s {si_signo=%s, si_code=SI_TKILL"
-	       ", si_pid=%d, si_uid=%u} ---\n",
+	       ", si_pid=%d, si_uid=%d} ---\n",
 	       stopped, "SIGSTOP", "SIGSTOP", stopped, geteuid());
 	printf("%-5d --- stopped by SIGSTOP ---\n", stopped);
 	printf("%-5d +++ exited with 0 +++\n", leader);
diff --git a/tests/pidfd_send_signal.c b/tests/pidfd_send_signal.c
index 4b7368153..8537a497b 100644
--- a/tests/pidfd_send_signal.c
+++ b/tests/pidfd_send_signal.c
@@ -54,7 +54,7 @@ main(void)
 
 	sys_pidfd_send_signal(fd, SIGUSR2, si, -1);
 	printf("pidfd_send_signal(%d, SIGUSR2, {si_signo=SIGUSR1"
-	       ", si_code=SI_QUEUE, si_errno=%u, si_pid=%u, si_uid=%u"
+	       ", si_code=SI_QUEUE, si_errno=%u, si_pid=%d, si_uid=%d"
 	       ", si_value={int=%d, ptr=%p}}, %#x) = %s\n",
 	       fd, si->si_errno, si->si_pid, si->si_uid, si->si_int, si->si_ptr,
 	       -1U, errstr);
diff --git a/tests/ptrace.c b/tests/ptrace.c
index dbd61b8df..699e27786 100644
--- a/tests/ptrace.c
+++ b/tests/ptrace.c
@@ -127,16 +127,16 @@ test_peeksiginfo(unsigned long pid, const unsigned long bad_request)
 			printf("ptrace(PTRACE_PEEKSIGINFO, %u"
 			       ", {off=%llu, flags=0, nr=%u}"
 			       ", [{si_signo=SIGUSR1, si_code=SI_TKILL"
-			       ", si_pid=%u, si_uid=%u}"
+			       ", si_pid=%d, si_uid=%d}"
 			       ", {si_signo=SIGUSR2, si_code=SI_TKILL"
-			       ", si_pid=%u, si_uid=%u}"
+			       ", si_pid=%d, si_uid=%d}"
 			       ", {si_signo=SIGALRM, si_code=SI_TKILL"
-			       ", si_pid=%u, si_uid=%u}"
+			       ", si_pid=%d, si_uid=%d}"
 			       "]) = %s\n",
 			       (unsigned) pid, psi->off, psi->nr,
-			       (unsigned) pid, (unsigned) uid,
-			       (unsigned) pid, (unsigned) uid,
-			       (unsigned) pid, (unsigned) uid,
+			       (int) pid, (int) uid,
+			       (int) pid, (int) uid,
+			       (int) pid, (int) uid,
 			       errstr);
 		}
 
diff --git a/tests/rt_sigqueueinfo.c b/tests/rt_sigqueueinfo.c
index 0455dd408..3d3ae52cd 100644
--- a/tests/rt_sigqueueinfo.c
+++ b/tests/rt_sigqueueinfo.c
@@ -27,7 +27,7 @@ main(void)
 	if (sigqueue(pid, SIGUSR1, value))
 		perror_msg_and_skip("sigqueue");
 	printf("rt_sigqueueinfo(%u, SIGUSR1, {si_signo=SIGUSR1, "
-		"si_code=SI_QUEUE, si_pid=%u, si_uid=%u, "
+		"si_code=SI_QUEUE, si_pid=%d, si_uid=%d, "
 		"si_value={int=%d, ptr=%p}}) = 0\n",
 		pid, pid, getuid(), value.sival_int, value.sival_ptr);
 	printf("+++ exited with 0 +++\n");
diff --git a/tests/rt_tgsigqueueinfo.c b/tests/rt_tgsigqueueinfo.c
index 658f1d31b..918e41d02 100644
--- a/tests/rt_tgsigqueueinfo.c
+++ b/tests/rt_tgsigqueueinfo.c
@@ -53,8 +53,8 @@ main(void)
 			"rt_tgsigqueueinfo");
 
 	printf("rt_tgsigqueueinfo(%u, %u, %s, {si_signo=%s"
-		", si_code=SI_QUEUE, si_errno=ENOENT, si_pid=%u"
-		", si_uid=%u, si_value={int=%d, ptr=%p}}) = 0\n",
+		", si_code=SI_QUEUE, si_errno=ENOENT, si_pid=%d"
+		", si_uid=%d, si_value={int=%d, ptr=%p}}) = 0\n",
 		info->si_pid, info->si_pid, "SIGUSR1", "SIGUSR1",
 		info->si_pid, info->si_uid, info->si_value.sival_int,
 		info->si_value.sival_ptr);
diff --git a/tests/siginfo.c b/tests/siginfo.c
index 7789ff279..91cfc3419 100644
--- a/tests/siginfo.c
+++ b/tests/siginfo.c
@@ -63,7 +63,7 @@ main(void)
 
 	sigsuspend(&unblock_mask);
 	tprintf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED"
-		", si_pid=%d, si_uid=%u, si_status=%d"
+		", si_pid=%d, si_uid=%d, si_status=%d"
 		", si_utime=%llu, si_stime=%llu} ---\n",
 		sinfo.si_pid, sinfo.si_uid, sinfo.si_status,
 		zero_extend_signed_to_ull(sinfo.si_utime),
@@ -94,7 +94,7 @@ main(void)
 
 	sigsuspend(&unblock_mask);
 	tprintf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_KILLED"
-		", si_pid=%d, si_uid=%u, si_status=SIGUSR1"
+		", si_pid=%d, si_uid=%d, si_status=SIGUSR1"
 		", si_utime=%llu, si_stime=%llu} ---\n",
 		sinfo.si_pid, sinfo.si_uid,
 		zero_extend_signed_to_ull(sinfo.si_utime),
@@ -121,7 +121,7 @@ main(void)
 
 	sigsuspend(&unblock_mask);
 	tprintf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_STOPPED"
-		", si_pid=%d, si_uid=%u, si_status=SIGSTOP"
+		", si_pid=%d, si_uid=%d, si_status=SIGSTOP"
 		", si_utime=%llu, si_stime=%llu} ---\n",
 		sinfo.si_pid, sinfo.si_uid,
 		zero_extend_signed_to_ull(sinfo.si_utime),
@@ -131,7 +131,7 @@ main(void)
 
 	sigsuspend(&unblock_mask);
 	tprintf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_CONTINUED"
-		", si_pid=%d, si_uid=%u, si_status=SIGCONT"
+		", si_pid=%d, si_uid=%d, si_status=SIGCONT"
 		", si_utime=%llu, si_stime=%llu} ---\n",
 		sinfo.si_pid, sinfo.si_uid,
 		zero_extend_signed_to_ull(sinfo.si_utime),
@@ -142,7 +142,7 @@ main(void)
 
 	sigsuspend(&unblock_mask);
 	tprintf("--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED"
-		", si_pid=%d, si_uid=%u, si_status=0"
+		", si_pid=%d, si_uid=%d, si_status=0"
 		", si_utime=%llu, si_stime=%llu} ---\n",
 		sinfo.si_pid, sinfo.si_uid,
 		zero_extend_signed_to_ull(sinfo.si_utime),
diff --git a/tests/waitid.c b/tests/waitid.c
index c58df5e2e..8716fa088 100644
--- a/tests/waitid.c
+++ b/tests/waitid.c
@@ -103,8 +103,8 @@ sprint_siginfo(const siginfo_t *const si, const char *const status_text)
 	snprintf(buf, sizeof(buf),
 		 "{si_signo=SIGCHLD"
 		 ", si_code=%s"
-		 ", si_pid=%u"
-		 ", si_uid=%u"
+		 ", si_pid=%d"
+		 ", si_uid=%d"
 		 ", si_status=%s"
 		 ", si_utime=%llu"
 		 ", si_stime=%llu}",