Alexandre Julliard : rpcrt4: Don' t use sizeof in traces to avoid printf format warnings.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 2a91838f0cb7fd40968aeb72e660f1af3e0a4490
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=2a91838f0cb7fd40968aeb72...

Author: Alexandre Julliard 
Date:   Tue Jun 13 14:11:28 2006 +0200

rpcrt4: Don't use sizeof in traces to avoid printf format warnings.

---

dlls/rpcrt4/rpc_message.c     |    2 +-
 dlls/rpcrt4/rpc_transport.c   |    6 +++---
 dlls/rpcrt4/rpcss_np_client.c |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c
index bd4b824..06b17d3 100644
--- a/dlls/rpcrt4/rpc_message.c
+++ b/dlls/rpcrt4/rpc_message.c
@@ -485,7 +485,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection 
   /* read packet common header */
   dwRead = rpcrt4_conn_read(Connection, &common_hdr, sizeof(common_hdr));
   if (dwRead != sizeof(common_hdr)) {
-    WARN("Short read of header, %ld/%d bytes\n", dwRead, sizeof(common_hdr));
+    WARN("Short read of header, %ld bytes\n", dwRead);
     status = RPC_S_PROTOCOL_ERROR;
     goto fail;
   }
diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c
index e32e8c2..6247362 100644
--- a/dlls/rpcrt4/rpc_transport.c
+++ b/dlls/rpcrt4/rpc_transport.c
@@ -317,7 +317,7 @@ static RPC_STATUS rpcrt4_ncacn_np_parse_
     const twr_empty_floor_t *smb_floor = (const twr_empty_floor_t *)tower_data;
     const twr_empty_floor_t *nb_floor;

-    TRACE("(%p, %d, %p, %p)\n", tower_data, tower_size, networkaddr, endpoint);
+    TRACE("(%p, %d, %p, %p)\n", tower_data, (int)tower_size, networkaddr, endpoint);

if (tower_size < sizeof(*smb_floor))
         return EPT_S_NOT_REGISTERED;
@@ -408,7 +408,7 @@ static RPC_STATUS rpcrt4_ncalrpc_parse_t
 {
     const twr_empty_floor_t *pipe_floor = (const twr_empty_floor_t *)tower_data;

-    TRACE("(%p, %d, %p, %p)\n", tower_data, tower_size, networkaddr, endpoint);
+    TRACE("(%p, %d, %p, %p)\n", tower_data, (int)tower_size, networkaddr, endpoint);

*networkaddr = NULL;
     *endpoint = NULL;
@@ -642,7 +642,7 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_pa
     const twr_ipv4_floor_t *ipv4_floor;
     struct in_addr in_addr;

-    TRACE("(%p, %d, %p, %p)\n", tower_data, tower_size, networkaddr, endpoint);
+    TRACE("(%p, %d, %p, %p)\n", tower_data, (int)tower_size, networkaddr, endpoint);

if (tower_size < sizeof(*tcp_floor))
         return EPT_S_NOT_REGISTERED;
diff --git a/dlls/rpcrt4/rpcss_np_client.c b/dlls/rpcrt4/rpcss_np_client.c
index 86d0be5..cace57c 100644
--- a/dlls/rpcrt4/rpcss_np_client.c
+++ b/dlls/rpcrt4/rpcss_np_client.c
@@ -145,7 +145,7 @@ BOOL RPCRT4_SendReceiveNPMsg(HANDLE np, 
   }

if (count != sizeof(RPCSS_NP_REPLY)) {
-    ERR("read count mismatch. got %ld, expected %u.\n", count, sizeof(RPCSS_NP_REPLY));
+    ERR("read count mismatch. got %ld.\n", count);
     return FALSE;
   }