commit e659f1e60cf4059a2bcf1d210556923b0ff9b604
author Mike McCormack <mike@codeweavers.com> Tue Aug 09 10:37:50 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Aug 09 10:37:50 2005 +0000
tree b4ebd879e6d0a1c58d936d3bb3d1a036dfe5e6fd
parent b0e091acbf0d5d8c891f4582d99a43612c8c0abf

Fix some gcc 4.0 warnings.

server/named_pipe.c

diff --git a/server/named_pipe.c b/server/named_pipe.c
index cd9d0d6..b22dfb1 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -712,7 +712,7 @@
     }
     else
     {
-        unsigned int timeout;
+        int timeout;
         if (req->timeout == NMPWAIT_USE_DEFAULT_WAIT)
             timeout = pipe->timeout;
         else

server/registry.c

diff --git a/server/registry.c b/server/registry.c
index 4b01b52..b34301d 100644
--- a/server/registry.c
+++ b/server/registry.c
@@ -879,7 +879,7 @@
 }
 
 /* get a key value */
-static void get_value( struct key *key, const WCHAR *name, int *type, int *len )
+static void get_value( struct key *key, const WCHAR *name, int *type, unsigned int *len )
 {
     struct key_value *value;
     int index;

server/request.c

diff --git a/server/request.c b/server/request.c
index 1fd19c1..6aa0072 100644
--- a/server/request.c
+++ b/server/request.c
@@ -488,7 +488,7 @@
     else if (event & POLLIN)
     {
         struct sockaddr_un dummy;
-        int len = sizeof(dummy);
+        unsigned int len = sizeof(dummy);
         int client = accept( get_unix_fd( master_socket->fd ), (struct sockaddr *) &dummy, &len );
         if (client == -1) return;
         if (sock->timeout)

server/sock.c

diff --git a/server/sock.c b/server/sock.c
index 4f164a7..0a9b4225 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -623,7 +623,6 @@
     struct sock *sock;
     int	acceptfd;
     struct sockaddr	saddr;
-    int			slen;
 
     sock=(struct sock*)get_handle_obj(current->process,handle,
                                       GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE,&sock_ops);
@@ -642,7 +641,7 @@
          * or that accept() is allowed on it. In those cases we will get -1/errno
          * return.
          */
-        slen = sizeof(saddr);
+        unsigned int slen = sizeof(saddr);
         acceptfd = accept( get_unix_fd(sock->fd), &saddr, &slen);
         if (acceptfd==-1)
         {

server/thread.c

diff --git a/server/thread.c b/server/thread.c
index b035bb9..e314314 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -734,8 +734,8 @@
     {
         unsigned char flags_buf[4];
         int *addr = (int *)thread->process->ldt_copy + entry;
-        if (read_thread_int( thread, addr, base ) == -1) goto done;
-        if (read_thread_int( thread, addr + 8192, limit ) == -1) goto done;
+        if (read_thread_int( thread, addr, (int *)base ) == -1) goto done;
+        if (read_thread_int( thread, addr + 8192, (int *)limit ) == -1) goto done;
         addr = (int *)thread->process->ldt_copy + 2*8192 + (entry >> 2);
         if (read_thread_int( thread, addr, (int *)flags_buf ) == -1) goto done;
         *flags = flags_buf[entry & 3];