svn commit: samba r22691 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_26/source/smbd

[vlendec at samba.org]

Author: vlendec
Date: 2007-05-05 21:13:40 +0000 (Sat, 05 May 2007)
New Revision: 22691

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22691

Log:
Fix a 64-bit warning and a const const discard warning

Modified:
   branches/SAMBA_3_0/source/smbd/dmapi.c
   branches/SAMBA_3_0/source/smbd/process.c
   branches/SAMBA_3_0_26/source/smbd/dmapi.c
   branches/SAMBA_3_0_26/source/smbd/process.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/dmapi.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/dmapi.c	2007-05-05 20:51:58 UTC (rev 22690)
+++ branches/SAMBA_3_0/source/smbd/dmapi.c	2007-05-05 21:13:40 UTC (rev 22691)
@@ -152,7 +152,8 @@
 
 	/* 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,

Modified: branches/SAMBA_3_0/source/smbd/process.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/process.c	2007-05-05 20:51:58 UTC (rev 22690)
+++ branches/SAMBA_3_0/source/smbd/process.c	2007-05-05 21:13:40 UTC (rev 22691)
@@ -1211,10 +1211,9 @@
 	/* 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);
 	}

Modified: branches/SAMBA_3_0_26/source/smbd/dmapi.c
===================================================================
--- branches/SAMBA_3_0_26/source/smbd/dmapi.c	2007-05-05 20:51:58 UTC (rev 22690)
+++ branches/SAMBA_3_0_26/source/smbd/dmapi.c	2007-05-05 21:13:40 UTC (rev 22691)
@@ -152,7 +152,8 @@
 
 	/* 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,

Modified: branches/SAMBA_3_0_26/source/smbd/process.c
===================================================================
--- branches/SAMBA_3_0_26/source/smbd/process.c	2007-05-05 20:51:58 UTC (rev 22690)
+++ branches/SAMBA_3_0_26/source/smbd/process.c	2007-05-05 21:13:40 UTC (rev 22691)
@@ -1202,10 +1202,9 @@
 	/* 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);
 	}