Rename umove_long_or_printaddr to umove_ulong_or_printaddr

Rename the recently added function to reflect what kind of data type
it actually deals with: unsigned long int, without sign extension.

* defs.h (umove_long_or_printaddr): Rename to umove_ulong_or_printaddr,
chage 3rd argument to unsigned long *.
* util.c (umove_long_or_printaddr): Likewise.
* aio.c (sys_io_submit): Update callers.

diff --git a/aio.c b/aio.c
index f8c73358369dbd8a18f659d3722876a89a56ac79..e9d36e3ce515540c79dabc15a76239a8e16aad4b 100644 (file)
--- a/aio.c
+++ b/aio.c
@@ -164,13 +164,13 @@ SYS_FUNC(io_submit)
                long iocbs = tcp->u_arg[2];
 
                for (i = 0; i < nr; ++i, iocbs += current_wordsize) {
-                       long iocbp;
+                       unsigned long iocbp;
                        struct iocb cb;
 
                        if (i)
                                tprints(", ");
 
-                       if (umove_long_or_printaddr(tcp, iocbs, &iocbp)) {
+                       if (umove_ulong_or_printaddr(tcp, iocbs, &iocbp)) {
                                /*
                                 * No point in trying to read the whole array
                                 * because nr can be ridiculously large.

diff --git a/defs.h b/defs.h
index 102dedf370deefbb62a33e231a9ecaaa0ee3f338..8833dfc88c10af853b9023c0a5cc336695b415b4 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -541,7 +541,7 @@ extern int umoven(struct tcb *, long, unsigned int, void *);
 extern int umoven_or_printaddr(struct tcb *, long, unsigned int, void *);
 #define umove_or_printaddr(pid, addr, objp)    \
        umoven_or_printaddr((pid), (addr), sizeof(*(objp)), (void *) (objp))
-extern int umove_long_or_printaddr(struct tcb *, long, long *);
+extern int umove_ulong_or_printaddr(struct tcb *, long, unsigned long *);
 extern int umovestr(struct tcb *, long, unsigned int, char *);
 extern int upeek(int pid, long, long *);
 

diff --git a/util.c b/util.c
index d40eafc2946a7f2bde896988f5de8e0f24f743e8..afd298ec433c5734b450f6732729b13a6740ee93 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1133,7 +1133,7 @@ umoven_or_printaddr(struct tcb *tcp, const long addr, const unsigned int len,
 }
 
 int
-umove_long_or_printaddr(struct tcb *tcp, const long addr, long *ptr)
+umove_ulong_or_printaddr(struct tcb *tcp, const long addr, unsigned long *ptr)
 {
        if (current_wordsize < sizeof(*ptr)) {
                uint32_t val32;