* gmp-impl.h (MPN_CMP): New macro.

	* mpz/cmp.c,cmpabs.c: Use it, and minor cleanups too.

1 files changed, 14 insertions, 19 deletions

diff --git a/mpz/cmpabs.c b/mpz/cmpabs.c
index 03b3be9f2..6e33c9a95 100644
--- a/mpz/cmpabs.c
+++ b/mpz/cmpabs.c
@@ -24,27 +24,22 @@ MA 02111-1307, USA. */
 #include "gmp.h"
 #include "gmp-impl.h"
 
+
 int
 mpz_cmpabs (mpz_srcptr u, mpz_srcptr v)
 {
-  mp_size_t usize = u->_mp_size;
-  mp_size_t vsize = v->_mp_size;
-  mp_srcptr up, vp;
-  int cmp;
-
-  usize = ABS (usize);
-  vsize = ABS (vsize);
-
-  if (usize != vsize)
-    return usize - vsize;
-
-  if (usize == 0)
-    return 0;
-
-  up = u->_mp_d;
-  vp = v->_mp_d;
-
-  cmp = mpn_cmp (up, vp, usize);
-
+  mp_size_t  usize, vsize, dsize;
+  mp_srcptr  up, vp;
+  int        cmp;
+
+  usize = ABSIZ (u);
+  vsize = ABSIZ (v);
+  dsize = usize - vsize;
+  if (dsize != 0)
+    return dsize;
+
+  up = PTR(u);
+  vp = PTR(v);
+  MPN_CMP (cmp, up, vp, usize);
   return cmp;
 }