commit 0a400c7a4f8c6b5e9d431a453703096fbb2c076b
author sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sat Jul 23 09:22:46 2005 +0000
committer sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sat Jul 23 09:22:46 2005 +0000
tree 622dde3685346e6c2c0f413f31ada422d4c031af
parent 9264559eba4aa5d397a278b4e1a50c03de30693f

Change some int uses to Int (the house types).


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4229 a5019735-40e9-0310-863c-91ae7b9d1cf9

coregrind/m_syswrap/syswrap-generic.c

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index f594a19..a6a4ba8 100644
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -308,7 +308,7 @@
 static OpenFd *allocated_fds;
 
 /* Count of open file descriptors. */
-static int fd_count = 0;
+static Int fd_count = 0;
 
 
 /* Note the fact that a file descriptor was just closed. */
@@ -433,7 +433,7 @@
  * Try get some details about a socket.
  */
 static void
-getsockdetails(int fd)
+getsockdetails(Int fd)
 {
    union u {
       struct vki_sockaddr a;
@@ -492,7 +492,7 @@
          VG_(message)(Vg_UserMsg, "Open file descriptor %d: %s", i->fd,
                       i->pathname);
       } else {
-         int val;
+         Int val;
          UInt len = sizeof(val);
 
          if (VG_(getsockopt)(i->fd, VKI_SOL_SOCKET, VKI_SO_TYPE, &val, &len) == -1) {
@@ -525,8 +525,8 @@
 void do_hacky_preopened()
 {
    struct vki_rlimit lim;
-   unsigned int count;
-   int i;
+   UInt count;
+   Int i;
 
    if (VG_(getrlimit) (VKI_RLIMIT_NOFILE, &lim) == -1) {
       /* Hmm.  getrlimit() failed.  Now we're screwed, so just choose
@@ -547,7 +547,7 @@
 
 void VG_(init_preopened_fds)()
 {
-   int ret;
+   Int ret;
    struct vki_dirent d;
    SysRes f;
 
@@ -562,7 +562,7 @@
          goto out;
 
       if (VG_(strcmp)(d.d_name, ".") && VG_(strcmp)(d.d_name, "..")) {
-         int fno = VG_(atoll)(d.d_name);
+         Int fno = VG_(atoll)(d.d_name);
 
          if (fno != f.val)
             if (VG_(clo_track_fds))
@@ -665,10 +665,10 @@
    while (cm) {
       if (cm->cmsg_level == VKI_SOL_SOCKET &&
           cm->cmsg_type == VKI_SCM_RIGHTS ) {
-         int *fds = (int *) VKI_CMSG_DATA(cm);
-         int fdc = (cm->cmsg_len - VKI_CMSG_ALIGN(sizeof(struct vki_cmsghdr)))
+         Int *fds = (Int *) VKI_CMSG_DATA(cm);
+         Int fdc = (cm->cmsg_len - VKI_CMSG_ALIGN(sizeof(struct vki_cmsghdr)))
                          / sizeof(int);
-         int i;
+         Int i;
 
          for (i = 0; i < fdc; i++)
             if(VG_(clo_track_fds))
@@ -847,7 +847,7 @@
 			current, newaddr, current-newaddr);
 
 	 if (newaddr != current) {
-	    int res = VG_(munmap)((void *)newaddr, current - newaddr);
+	    Int res = VG_(munmap)((void *)newaddr, current - newaddr);
             vg_assert(0 == res);
 	 }
 	 ret = newbrk;