From: Volker Lendecke Date: Sat, 5 May 2007 21:13:40 +0000 (+0000) Subject: r22691: Fix a 64-bit warning and a const const discard warning X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~548 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a2ca1b1b85e268928587287f61d26f992b303a5;p=thirdparty%2Fsamba.git r22691: Fix a 64-bit warning and a const const discard warning --- diff --git a/source/smbd/dmapi.c b/source/smbd/dmapi.c index b8c23c2dce6..23b5d5e947a 100644 --- a/source/smbd/dmapi.c +++ b/source/smbd/dmapi.c @@ -152,7 +152,8 @@ retry: /* No session already defined. */ if (dmapi_session == DM_NO_SESSION) { - err = dm_create_session(DM_NO_SESSION, DMAPI_SESSION_NAME, + err = dm_create_session(DM_NO_SESSION, + CONST_DISCARD(DMAPI_SESSION_NAME), &dmapi_session); if (err < 0) { DEBUGADD(DMAPI_TRACE, diff --git a/source/smbd/process.c b/source/smbd/process.c index 16c1d80c0f7..44baa96059f 100644 --- a/source/smbd/process.c +++ b/source/smbd/process.c @@ -1211,10 +1211,9 @@ int chain_reply(char *inbuf,char *outbuf,int size,int bufsize) /* work out the new size for the in buffer. */ new_size = size - (inbuf2 - inbuf); if (new_size < 0) { - DEBUG(0,("chain_reply: chain packet size incorrect (orig size = %d, " - "offset = %d)\n", - size, - (inbuf2 - inbuf) )); + DEBUG(0,("chain_reply: chain packet size incorrect " + "(orig size = %d, offset = %d)\n", + size, (int)(inbuf2 - inbuf) )); exit_server_cleanly("Bad chained packet"); return(-1); }