svn commit: samba r20436 - in branches/SAMBA_4_0/source/lib/util: .

metze at samba.org metze at samba.org
Sun Dec 31 12:28:17 GMT 2006


Author: metze
Date: 2006-12-31 12:28:16 +0000 (Sun, 31 Dec 2006)
New Revision: 20436

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

Log:
add more comments and add macros signed versions of the 64 bit
macros

metze
Modified:
   branches/SAMBA_4_0/source/lib/util/byteorder.h


Changeset:
Modified: branches/SAMBA_4_0/source/lib/util/byteorder.h
===================================================================
--- branches/SAMBA_4_0/source/lib/util/byteorder.h	2006-12-31 12:18:59 UTC (rev 20435)
+++ branches/SAMBA_4_0/source/lib/util/byteorder.h	2006-12-31 12:28:16 UTC (rev 20436)
@@ -73,13 +73,17 @@
 
 SVAL(buf,pos) - extract a 2 byte SMB value
 IVAL(buf,pos) - extract a 4 byte SMB value
-SVALS(buf,pos) signed version of SVAL()
-IVALS(buf,pos) signed version of IVAL()
+BVAL(buf,pos) - extract a 8 byte SMB value
+SVALS(buf,pos) - signed version of SVAL()
+IVALS(buf,pos) - signed version of IVAL()
+BVALS(buf,pos) - signed version of BVAL()
 
 SSVAL(buf,pos,val) - put a 2 byte SMB value into a buffer
 SIVAL(buf,pos,val) - put a 4 byte SMB value into a buffer
+SBVAL(buf,pos,val) - put a 8 byte SMB value into a buffer
 SSVALS(buf,pos,val) - signed version of SSVAL()
 SIVALS(buf,pos,val) - signed version of SIVAL()
+SBVALS(buf,pos,val) - signed version of SBVAL()
 
 RSVAL(buf,pos) - like SVAL() but for NMB byte ordering
 RSVALS(buf,pos) - like SVALS() but for NMB byte ordering
@@ -218,7 +222,9 @@
 #define VWV(vwv) ((vwv)*2)
 
 /* 64 bit macros */
+#define BVAL(p, ofs) (IVAL(p,ofs) | (((uint64_t)IVAL(p,(ofs)+4)) << 32))
+#define BVALS(p, ofs) ((int64_t)BVAL(p,ofs))
 #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))
+#define SBVALS(p, ofs, v) (SBVAL(p,ofs,(uint64_t)v))
 
 #endif /* _BYTEORDER_H */



More information about the samba-cvs mailing list