Replace printargs_lu and printargs_ld with printargs_u and printargs_d
* defs.h (printargs_lu): Rename to printargs_u.
(printargs_ld): Rename to printargs_d.
* syscall.c (printargs_lu): Rename to printargs_u. Replace %lu with %u.
(printargs_ld): Rename to printargs_d. Replace %ld with %d.
* linux/dummy.h (sys_getpgrp): Change to printargs.
(sys_alarm): Change to printargs_u.
(sys_getpgid, sys_getsid, sys_nice, sys_setpgid, sys_setpgrp,
sys_timer_delete, sys_timer_getoverrun): Change to printargs_d.
diff --git a/defs.h b/defs.h
index 86b6434..f095ff6 100644
--- a/defs.h
+++ b/defs.h
@@ -557,8 +557,9 @@
extern void printxvals(const unsigned int, const char *, const struct xlat *, ...);
#define printxval(xlat, val, dflt) printxvals(val, dflt, xlat, NULL)
extern int printargs(struct tcb *);
-extern int printargs_lu(struct tcb *);
-extern int printargs_ld(struct tcb *);
+extern int printargs_u(struct tcb *);
+extern int printargs_d(struct tcb *);
+
extern void addflags(const struct xlat *, int);
extern int printflags(const struct xlat *, int, const char *);
extern const char *sprintflags(const char *, const struct xlat *, int);
diff --git a/linux/dummy.h b/linux/dummy.h
index aa1b1b5..984b290 100644
--- a/linux/dummy.h
+++ b/linux/dummy.h
@@ -98,7 +98,7 @@
#define sys_vfork sys_fork
/* printargs does the right thing */
-#define sys_getpgid printargs
+#define sys_getpgrp printargs
#define sys_getpid printargs
#define sys_getppid printargs
#define sys_gettid printargs
@@ -116,17 +116,19 @@
#define sys_socketcall printargs
#define sys_sync printargs
#define sys_syscall printargs
-#define sys_timer_delete printargs
-#define sys_timer_getoverrun printargs
#define sys_vhangup printargs
-/* printargs_lu/ld does the right thing */
-#define sys_alarm printargs_lu
-#define sys_getpgrp printargs_lu
-#define sys_getsid printargs_lu
-#define sys_nice printargs_ld
-#define sys_setpgid printargs_lu
-#define sys_setpgrp printargs_lu
+/* printargs_u does the right thing */
+#define sys_alarm printargs_u
+
+/* printargs_d does the right thing */
+#define sys_getpgid printargs_d
+#define sys_getsid printargs_d
+#define sys_nice printargs_d
+#define sys_setpgid printargs_d
+#define sys_setpgrp printargs_d
+#define sys_timer_delete printargs_d
+#define sys_timer_getoverrun printargs_d
/* unimplemented */
#define sys_afs_syscall printargs
diff --git a/syscall.c b/syscall.c
index a21fd71..6efcde5 100644
--- a/syscall.c
+++ b/syscall.c
@@ -643,22 +643,24 @@
}
int
-printargs_lu(struct tcb *tcp)
+printargs_u(struct tcb *tcp)
{
const int n = tcp->s_ent->nargs;
int i;
for (i = 0; i < n; ++i)
- tprintf("%s%lu", i ? ", " : "", tcp->u_arg[i]);
+ tprintf("%s%u", i ? ", " : "",
+ (unsigned int) tcp->u_arg[i]);
return RVAL_DECODED;
}
int
-printargs_ld(struct tcb *tcp)
+printargs_d(struct tcb *tcp)
{
const int n = tcp->s_ent->nargs;
int i;
for (i = 0; i < n; ++i)
- tprintf("%s%ld", i ? ", " : "", tcp->u_arg[i]);
+ tprintf("%s%d", i ? ", " : "",
+ (int) tcp->u_arg[i]);
return RVAL_DECODED;
}
