From: Jim Meyering <jim@meyering.net>
Date: Thu, 15 Apr 2004 09:11:42 +0000 (+0000)
Subject: (ROUND_UP_OFFSET, PTR_ALIGN): Remove.
X-Git-Tag: v5.3.0~1773
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5d9418d66e71cbdb5f73182590b4893682e4c07;p=thirdparty%2Fcoreutils.git

(ROUND_UP_OFFSET, PTR_ALIGN): Remove.
All uses replaced by ptr_align.
---

diff --git a/src/dd.c b/src/dd.c
index 3700822fdd..535469e738 100644
--- a/src/dd.c
+++ b/src/dd.c
@@ -53,10 +53,6 @@
 # define fdatasync(fd) (errno = ENOSYS, -1)
 #endif
 
-#define ROUND_UP_OFFSET(X, M) ((M) - 1 - (((X) + (M) - 1) % (M)))
-#define PTR_ALIGN(Ptr, M) ((Ptr) \
-			   + ROUND_UP_OFFSET ((char *)(Ptr) - (char *)0, (M)))
-
 #define max(a, b) ((a) > (b) ? (a) : (b))
 #define output_char(c)				\
   do						\
@@ -1061,13 +1057,13 @@ dd_copy (void)
   ibuf = real_buf;
   ibuf += SWAB_ALIGN_OFFSET;	/* allow space for swab */
 
-  ibuf = PTR_ALIGN (ibuf, page_size);
+  ibuf = ptr_align (ibuf, page_size);
 
   if (conversions_mask & C_TWOBUFS)
     {
       /* Page-align the output buffer, too.  */
       real_obuf = xmalloc (output_blocksize + page_size - 1);
-      obuf = PTR_ALIGN (real_obuf, page_size);
+      obuf = ptr_align (real_obuf, page_size);
     }
   else
     {