From 17ea0bd3b5bcdd18dc812fc6316668785f902f3b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 11 Apr 2000 14:24:48 +0000
Subject: add an align4() function (This used to be commit
 7969f4dccbc5a506ef58b9270a08f8f70d9006f7)

---
 source3/lib/util.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/lib/util.c b/source3/lib/util.c
index ebb89c9d89..fdd2b98c56 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -2607,13 +2607,26 @@ align a pointer to a multiple of 2 bytes
 ********************************************************************/
 char *align2(char *q, char *base)
 {
-	if ((q - base) & 1)
+	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;
-- 
cgit