Module Name: src
Committed By: martin
Date: Tue Sep 6 07:45:41 UTC 2016
Modified Files:
src/lib/librumpclient: rumpclient.c
src/lib/librumpuser: rumpuser_sp.c
Log Message:
Redo previous by avoiding the casts and using PRIxREGISTER instead
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/lib/librumpclient/rumpclient.c
cvs rdiff -u -r1.71 -r1.72 src/lib/librumpuser/rumpuser_sp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpclient/rumpclient.c
diff -u src/lib/librumpclient/rumpclient.c:1.66 src/lib/librumpclient/rumpclient.c:1.67
--- src/lib/librumpclient/rumpclient.c:1.66 Tue Sep 6 07:12:48 2016
+++ src/lib/librumpclient/rumpclient.c Tue Sep 6 07:45:41 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpclient.c,v 1.66 2016/09/06 07:12:48 martin Exp $ */
+/* $NetBSD: rumpclient.c,v 1.67 2016/09/06 07:45:41 martin Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -50,7 +50,7 @@
#define USE_SIGNALFD
#endif
-__RCSID("$NetBSD: rumpclient.c,v 1.66 2016/09/06 07:12:48 martin Exp $");
+__RCSID("$NetBSD: rumpclient.c,v 1.67 2016/09/06 07:45:41 martin Exp $");
#include <sys/param.h>
#include <sys/mman.h>
@@ -590,9 +590,9 @@ rumpclient_syscall(int sysnum, const voi
goto out;
resp = rdata;
- DPRINTF(("rumpsp syscall_resp: syscall %d error %d, rv: %ld/%ld\n",
- sysnum, rv, (unsigned long)resp->rsys_retval[0],
- (unsigned long)resp->rsys_retval[1]));
+ DPRINTF(("rumpsp syscall_resp: syscall %d error %d, rv: %"
+ PRIxREGISTER"/%"PRIxREGISTER"\n",
+ sysnum, rv, resp->rsys_retval[0], resp->rsys_retval[1]));
memcpy(retval, &resp->rsys_retval, sizeof(resp->rsys_retval));
rv = resp->rsys_error;
Index: src/lib/librumpuser/rumpuser_sp.c
diff -u src/lib/librumpuser/rumpuser_sp.c:1.71 src/lib/librumpuser/rumpuser_sp.c:1.72
--- src/lib/librumpuser/rumpuser_sp.c:1.71 Tue Sep 6 07:32:39 2016
+++ src/lib/librumpuser/rumpuser_sp.c Tue Sep 6 07:45:41 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_sp.c,v 1.71 2016/09/06 07:32:39 martin Exp $ */
+/* $NetBSD: rumpuser_sp.c,v 1.72 2016/09/06 07:45:41 martin Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -37,7 +37,7 @@
#include "rumpuser_port.h"
#if !defined(lint)
-__RCSID("$NetBSD: rumpuser_sp.c,v 1.71 2016/09/06 07:32:39 martin Exp $");
+__RCSID("$NetBSD: rumpuser_sp.c,v 1.72 2016/09/06 07:45:41 martin Exp $");
#endif /* !lint */
#include <sys/types.h>
@@ -691,8 +691,9 @@ serv_handlesyscall(struct spclient *spc,
spc->spc_syscallreq = 0;
lwproc_release();
- DPRINTF(("rump_sp: got return value %d & %ld/%ld\n",
- rv, (long)retval[0], (long)retval[1]));
+ DPRINTF(("rump_sp: got return value %d & %"PRIxREGISTER
+ "/%"PRIxREGISTER"\n",
+ rv, retval[0], retval[1]));
send_syscall_resp(spc, rhdr->rsp_reqno, rv, retval);
}
