cleanup: Big pile of whitespace fixes, all at once.

[catacomb] / gf-gcd.c

diff --git a/gf-gcd.c b/gf-gcd.c
index 622679a..9b5402b 100644 (file)
--- a/gf-gcd.c
+++ b/gf-gcd.c
@@ -7,7 +7,7 @@
  * (c) 2004 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,12 +15,12 @@
  * 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,
@@ -106,15 +106,7 @@ void gf_gcd(mp **gcd, mp **xx, mp **yy, mp *a, mp *b)
     return;
   }
 
-  /* --- Take a reference to the arguments --- */
-
-  a = MP_COPY(a);
-  b = MP_COPY(b);
-
-  /* --- Make sure @a@ and @b@ are not both even --- */
-
-  MP_SPLIT(a); a->f &= ~MP_NEG;
-  MP_SPLIT(b); b->f &= ~MP_NEG;
+  /* --- Main extended Euclidean algorithm --- */
 
   u = MP_COPY(a);
   v = MP_COPY(b);
@@ -124,10 +116,10 @@ void gf_gcd(mp **gcd, mp **xx, mp **yy, mp *a, mp *b)
     gf_div(&q, &u, u, v);
     if (f & f_ext) {
       t = gf_mul(MP_NEW, X, q);
-      t = gf_add(t, x, t);
+      t = gf_add(t, t, x);
       MP_DROP(x); x = X; X = t;
       t = gf_mul(MP_NEW, Y, q);
-      t = gf_add(t, y, t);
+      t = gf_add(t, t, y);
       MP_DROP(y); y = Y; Y = t;
     }
     t = u; u = v; v = t;
@@ -172,7 +164,6 @@ void gf_gcd(mp **gcd, mp **xx, mp **yy, mp *a, mp *b)
 
   MP_DROP(v);
   MP_DROP(X); MP_DROP(Y);
-  MP_DROP(a); MP_DROP(b);
 }
 
 /* -- @gf_modinv@ --- *
@@ -214,8 +205,8 @@ static int gcd(dstr *v)
   gf_gcd(&gg, &xx, &yy, a, b);
   if (!MP_EQ(x, xx)) {
     fputs("\n*** gf_gcd(x) failed", stderr);
-    fputs("\na      = ", stderr); mp_writefile(a, stderr, 16);
-    fputs("\nb      = ", stderr); mp_writefile(b, stderr, 16);
+    fputs("\na     = ", stderr); mp_writefile(a, stderr, 16);
+    fputs("\nb     = ", stderr); mp_writefile(b, stderr, 16);
     fputs("\nexpect = ", stderr); mp_writefile(x, stderr, 16);
     fputs("\nresult = ", stderr); mp_writefile(xx, stderr, 16);
     fputc('\n', stderr);
@@ -223,8 +214,8 @@ static int gcd(dstr *v)
   }
   if (!MP_EQ(y, yy)) {
     fputs("\n*** gf_gcd(y) failed", stderr);
-    fputs("\na      = ", stderr); mp_writefile(a, stderr, 16);
-    fputs("\nb      = ", stderr); mp_writefile(b, stderr, 16);
+    fputs("\na     = ", stderr); mp_writefile(a, stderr, 16);
+    fputs("\nb     = ", stderr); mp_writefile(b, stderr, 16);
     fputs("\nexpect = ", stderr); mp_writefile(y, stderr, 16);
     fputs("\nresult = ", stderr); mp_writefile(yy, stderr, 16);
     fputc('\n', stderr);
@@ -243,8 +234,8 @@ static int gcd(dstr *v)
 
   if (!MP_EQ(g, gg)) {
     fputs("\n*** gf_gcd(gcd) failed", stderr);
-    fputs("\na      = ", stderr); mp_writefile(a, stderr, 16);
-    fputs("\nb      = ", stderr); mp_writefile(b, stderr, 16);
+    fputs("\na     = ", stderr); mp_writefile(a, stderr, 16);
+    fputs("\nb     = ", stderr); mp_writefile(b, stderr, 16);
     fputs("\nexpect = ", stderr); mp_writefile(g, stderr, 16);
     fputs("\nresult = ", stderr); mp_writefile(gg, stderr, 16);
     fputc('\n', stderr);