[Valgrind-developers] valgrind/coregrind

[Nicholas N. <nj...@ca...>]

CVS commit by nethercote: 

64-bit cleanness: fix some more pointer casts to UInt.


  M +16 -16    vg_mylibc.c   1.103


--- valgrind/coregrind/vg_mylibc.c  #1.102:1.103
@@ -1940,5 +1940,5 @@ Int my_socket ( Int domain, Int type, In
 {
    Int res;
-   UInt args[3];
+   UWord args[3];
    args[0] = domain;
    args[1] = type;
@@ -1955,7 +1955,7 @@ Int my_connect ( Int sockfd, struct vki_
 {
    Int res;
-   UInt args[3];
+   UWord args[3];
    args[0] = sockfd;
-   args[1] = (UInt)serv_addr;
+   args[1] = (UWord)serv_addr;
    args[2] = addrlen;
    res = VG_(do_syscall)(__NR_socketcall, VKI_SYS_CONNECT, (UWord)&args);
@@ -1975,7 +1975,7 @@ Int VG_(write_socket)( Int sd, void *msg
 
    Int res;
-   UInt args[4];
+   UWord args[4];
    args[0] = sd;
-   args[1] = (UInt)msg;
+   args[1] = (UWord)msg;
    args[2] = count;
    args[3] = flags;
@@ -1989,8 +1989,8 @@ Int VG_(getsockname) ( Int sd, struct vk
 {
    Int res;
-   UInt args[3];
+   UWord args[3];
    args[0] = sd;
-   args[1] = (UInt)name;
-   args[2] = (UInt)namelen;
+   args[1] = (UWord)name;
+   args[2] = (UWord)namelen;
    res = VG_(do_syscall)(__NR_socketcall, VKI_SYS_GETSOCKNAME, (UWord)&args);
    if(VG_(is_kerror)(res))
@@ -2002,8 +2002,8 @@ Int VG_(getpeername) ( Int sd, struct vk
 {
    Int res;
-   UInt args[3];
+   UWord args[3];
    args[0] = sd;
-   args[1] = (UInt)name;
-   args[2] = (UInt)namelen;
+   args[1] = (UWord)name;
+   args[2] = (UWord)namelen;
    res = VG_(do_syscall)(__NR_socketcall, VKI_SYS_GETPEERNAME, (UWord)&args);
    if(VG_(is_kerror)(res))
@@ -2016,10 +2016,10 @@ Int VG_(getsockopt) ( Int sd, Int level,
 {
    Int res;
-   UInt args[5];
+   UWord args[5];
    args[0] = sd;
-   args[1] = (UInt)level;
-   args[2] = (UInt)optname;
-   args[3] = (UInt)optval;
-   args[4] = (UInt)optlen;
+   args[1] = level;
+   args[2] = optname;
+   args[3] = (UWord)optval;
+   args[4] = (UWord)optlen;
    res = VG_(do_syscall)(__NR_socketcall, VKI_SYS_GETSOCKOPT, (UWord)&args);
    if(VG_(is_kerror)(res))