svn commit: samba r11675 - in branches/SAMBA_4_0/source: include libcli/smb2

[metze at samba.org]

Author: metze
Date: 2005-11-11 10:46:31 +0000 (Fri, 11 Nov 2005)
New Revision: 11675

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

Log:
a more general way of getting rid of compiler warnings and errors

metze
Modified:
   branches/SAMBA_4_0/source/include/byteorder.h
   branches/SAMBA_4_0/source/libcli/smb2/request.c


Changeset:
Modified: branches/SAMBA_4_0/source/include/byteorder.h
===================================================================
--- branches/SAMBA_4_0/source/include/byteorder.h	2005-11-11 09:11:51 UTC (rev 11674)
+++ branches/SAMBA_4_0/source/include/byteorder.h	2005-11-11 10:46:31 UTC (rev 11675)
@@ -218,7 +218,7 @@
 #define VWV(vwv) ((vwv)*2)
 
 /* 64 bit macros */
-#define SBVAL(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32))
+#define SBVAL(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,((uint64_t)(v))>>32))
 #define BVAL(p, ofs) (IVAL(p,ofs) | (((uint64_t)IVAL(p,(ofs)+4)) << 32))
 
 #endif /* _BYTEORDER_H */

Modified: branches/SAMBA_4_0/source/libcli/smb2/request.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/smb2/request.c	2005-11-11 09:11:51 UTC (rev 11674)
+++ branches/SAMBA_4_0/source/libcli/smb2/request.c	2005-11-11 10:46:31 UTC (rev 11675)
@@ -70,7 +70,7 @@
 	SBVAL(req->out.hdr, SMB2_HDR_SEQNUM,  req->seqnum);
 	SIVAL(req->out.hdr, SMB2_HDR_PID,     0);
 	SIVAL(req->out.hdr, SMB2_HDR_TID,     0);
-	SBVAL(req->out.hdr, SMB2_HDR_UID,     (uint64_t)0);
+	SBVAL(req->out.hdr, SMB2_HDR_UID,     0);
 	memset(req->out.hdr+SMB2_HDR_SIG, 0, 16);
 
 	return req;