include/byteorder.h: ALIGN4/ALIGN2 macros.

include/includes.h: Added SMB_BIG_UINT_BITS.
lib/util.c: Removed align2/align4 - use macros.
libsmb/namequery.c: Use ALIGN2.
locking/locking.c: Replace do_lock, do_unlock, args with SMB_BIG_UINT, not SMB_OFF_T.
                   Needed to move to hiding POSIX locks at a lower layer.
nmbd/nmbd_processlogon.c: Use ALIGN2/ALIGN4 macros.
smbd/blocking.c: Replace do_lock, do_unlock, args with SMB_BIG_UINT, not SMB_OFF_T.
smbd/reply.c: Replace do_lock, do_unlock, args with SMB_BIG_UINT, not SMB_OFF_T.
Jeremy.

1 files changed, 0 insertions, 25 deletions

diff --git a/source/lib/util.c b/source/lib/util.c
index fdd2b98c562..8c5ea1d208c 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -2602,31 +2602,6 @@ enum remote_arch_types get_remote_arch(void)
 }
 
 
-/*******************************************************************
-align a pointer to a multiple of 2 bytes
-********************************************************************/
-char *align2(char *q, char *base)
-{
-	if (PTR_DIFF(q, base) & 1)
-	{
-		q++;
-	}
-	return q;
-}
-
-/*******************************************************************
- align a pointer to a multiple of 4 bytes.  
- ********************************************************************/
-char *align4(char *q, char *base)
-{
-	int mod = PTR_DIFF(q, base) & 3;
-	if (mod != 0)
-	{
-		q += 4-mod;
-	}
-	return q;
-}
-
 void out_ascii(FILE *f, unsigned char *buf,int len)
 {
 	int i;