Stop using non-standard %Zu and %Zd formats for size_t printing

The documented formats are %zu and %zd, but since our (normally disabled)
"fast" printf code doesn't support those too, I convert them to %lu and %ld.

* bjm.c (sys_query_module): Convert %Zd usages to %lu.
* system.c (sys_sysctl): Likewise.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/bjm.c b/bjm.c
index 6ae3758..364dca7 100644
--- a/bjm.c
+++ b/bjm.c
@@ -115,7 +115,7 @@ sys_query_module(struct tcb *tcp)
 				printflags(modflags, mi.flags, "MOD_???");
 				tprintf(", usecount=%lu}, ", mi.usecount);
 			}
-			tprintf("%Zu", ret);
+			tprintf("%lu", (unsigned long)ret);
 		} else if ((tcp->u_arg[1]==QM_MODULES) ||
 			   (tcp->u_arg[1]==QM_DEPS) ||
 			   (tcp->u_arg[1]==QM_REFS)) {
@@ -127,11 +127,11 @@ sys_query_module(struct tcb *tcp)
 
 				if (!data) {
 					fprintf(stderr, "out of memory\n");
-					tprintf(" /* %Zu entries */ ", ret);
+					tprintf(" /* %lu entries */ ", (unsigned long)ret);
 				} else {
 					if (umoven(tcp, tcp->u_arg[2],
 						tcp->u_arg[3], data) < 0) {
-						tprintf(" /* %Zu entries */ ", ret);
+						tprintf(" /* %lu entries */ ", (unsigned long)ret);
 					} else {
 						for (idx = 0; idx < ret; idx++) {
 							tprintf("%s%s",
@@ -143,8 +143,8 @@ sys_query_module(struct tcb *tcp)
 					free(data);
 				}
 			} else
-				tprintf(" /* %Zu entries */ ", ret);
-			tprintf("}, %Zu", ret);
+				tprintf(" /* %lu entries */ ", (unsigned long)ret);
+			tprintf("}, %lu", (unsigned long)ret);
 		} else if (tcp->u_arg[1]==QM_SYMBOLS) {
 			tprints("{");
 			if (!abbrev(tcp)) {
@@ -154,11 +154,11 @@ sys_query_module(struct tcb *tcp)
 
 				if (!data) {
 					fprintf(stderr, "out of memory\n");
-					tprintf(" /* %Zu entries */ ", ret);
+					tprintf(" /* %lu entries */ ", (unsigned long)ret);
 				} else {
 					if (umoven(tcp, tcp->u_arg[2],
 						tcp->u_arg[3], data) < 0) {
-						tprintf(" /* %Zu entries */ ", ret);
+						tprintf(" /* %lu entries */ ", (unsigned long)ret);
 					} else {
 						for (idx = 0; idx < ret; idx++) {
 							tprintf("%s{name=%s, value=%lu}",
@@ -171,8 +171,8 @@ sys_query_module(struct tcb *tcp)
 					free(data);
 				}
 			} else
-				tprintf(" /* %Zu entries */ ", ret);
-			tprintf("}, %Zd", ret);
+				tprintf(" /* %lu entries */ ", (unsigned long)ret);
+			tprintf("}, %ld", (unsigned long)ret);
 		} else {
 			printstr(tcp, tcp->u_arg[2], tcp->u_arg[3]);
 			tprintf(", %#lx", tcp->u_arg[4]);