keyutil.c: Remove stray tabs and trailing space from the list format.

[u/mdw/catacomb] / mp-sqrt.c

diff --git a/mp-sqrt.c b/mp-sqrt.c
index 83880f9..1491021 100644 (file)
--- a/mp-sqrt.c
+++ b/mp-sqrt.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: mp-sqrt.c,v 1.4 2004/03/27 17:54:11 mdw Exp $
+ * $Id$
  *
  * Compute integer square roots
  *
  * (c) 2000 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,36 +15,18 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * Catacomb is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with Catacomb; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: mp-sqrt.c,v $
- * Revision 1.4  2004/03/27 17:54:11  mdw
- * Standard curves and curve checking.
- *
- * Revision 1.3  2001/02/03 12:00:29  mdw
- * Now @mp_drop@ checks its argument is non-NULL before attempting to free
- * it.  Note that the macro version @MP_DROP@ doesn't do this.
- *
- * Revision 1.2  2000/10/08 12:02:21  mdw
- * Use @MP_EQ@ instead of @MP_CMP@.
- *
- * Revision 1.1  2000/06/22 19:01:44  mdw
- * Compute (approximations to) integer square roots.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "mp.h"
@@ -72,12 +54,12 @@ mp *mp_sqrt(mp *d, mp *a)
 
   /* --- Sanity preservation --- */
 
-  assert(((void)"imaginary root in mp_sqrt", !(a->f & MP_NEG)));
+  assert(!MP_NEGP(a));
 
   /* --- Deal with trivial cases --- */
 
   MP_SHRINK(a);
-  if (a->v == a->vl) {
+  if (MP_ZEROP(a)) {
     mp_drop(d);
     return (MP_ZERO);
   }
@@ -102,12 +84,12 @@ mp *mp_sqrt(mp *d, mp *a)
   for (;;) {
     q = mp_sqr(q, d);
     q = mp_sub(q, q, a);
-    if (q->v == q->vl)
+    if (MP_ZEROP(q))
       break;
-    if (q->f & MP_NEG) {
+    if (MP_NEGP(q)) {
       r = mp_lsl(r, d, 1);
       r->f |= MP_NEG;
-      if (MP_CMP(q, <=, r))
+      if (MP_CMP(q, >=, r))
        break;
     }
     mp_div(&r, &q, q, d);
@@ -142,7 +124,7 @@ static int verify(dstr *v)
   if (!MP_EQ(q, qq)) {
     ok = 0;
     fputs("\n*** sqrt failed", stderr);
-    fputs("\n*** a      = ", stderr); mp_writefile(a, stderr, 10);
+    fputs("\n*** a     = ", stderr); mp_writefile(a, stderr, 10);
     fputs("\n*** result = ", stderr); mp_writefile(q, stderr, 10);
     fputs("\n*** expect = ", stderr); mp_writefile(qq, stderr, 10);
     fputc('\n', stderr);