From: Wayne Davison Date: Fri, 20 Apr 2007 08:16:59 +0000 (+0000) Subject: Got rid of the NVAL*() defines. X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/1c60d219472b3de0080cda807b014d011e3b5ccb Got rid of the NVAL*() defines. --- diff --git a/byteorder.h b/byteorder.h index 2261e47d..0ce87a24 100644 --- a/byteorder.h +++ b/byteorder.h @@ -34,17 +34,6 @@ #define UVAL(buf,pos) ((uint32)CVAL(buf,pos)) #define SCVAL(buf,pos,val) (CVAL(buf,pos) = (val)) -/* Our 64-bit numbers are sent in MSB-first order so that we can use - * the highest bits to indicate the number of bytes sent. */ -#define NVAL1(b,m) (UVAL(b,0)&~(uint32)(m)) -#define NVAL2(b,m) (NVAL1(b,m)<<8|UVAL(b,1)) -#define NVAL3(b,m) (NVAL2(b,m)<<8|UVAL(b,2)) -#define NVAL4(b,m) (NVAL3(b,m)<<8|UVAL(b,3)) -#define NVAL5(b,m) ((int64)NVAL4(b,m)<<8|UVAL(b,4)) -#define NVAL6(b,m) (NVAL5(b,m)<<8|UVAL(b,5)) -#define NVAL7(b,m) (NVAL6(b,m)<<8|UVAL(b,6)) -#define NVAL8(b,m) (NVAL7(b,m)<<8|UVAL(b,7)) - #if CAREFUL_ALIGNMENT #define PVAL(buf,pos) (UVAL(buf,pos)|UVAL(buf,(pos)+1)<<8) #define IVAL(buf,pos) (PVAL(buf,pos)|PVAL(buf,(pos)+2)<<16)