X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/34e4f738bcba58e6d8c4cabbb0b3232a65b42a9d..e564e3f84ad0ea42b78559c0bfe304893fd5e76b:/field.c

diff --git a/field.c b/field.c
index f0968dd..8fb1ad6 100644
--- a/field.c
+++ b/field.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: field.c,v 1.3 2004/04/01 12:50:09 mdw Exp $
+ * $Id$
  *
  * Abstract field operations
  *
  * (c) 2001 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,39 +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: field.c,v $
- * Revision 1.3  2004/04/01 12:50:09  mdw
- * Add cyclic group abstraction, with test code.  Separate off exponentation
- * functions for better static linking.  Fix a buttload of bugs on the way.
- * Generally ensure that negative exponents do inversion correctly.  Add
- * table of standard prime-field subgroups.  (Binary field subgroups are
- * currently unimplemented but easy to add if anyone ever finds a good one.)
- *
- * Revision 1.2  2004/03/21 22:52:06  mdw
- * Merge and close elliptic curve branch.
- *
- * Revision 1.1.4.1  2003/06/10 13:43:53  mdw
- * Simple (non-projective) curves over prime fields now seem to work.
- *
- * Revision 1.1  2001/05/07 17:30:13  mdw
- * Add an internal-representation no-op function.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "field.h"
@@ -68,11 +47,7 @@
  */
 
 mp *field_id(field *f, mp *d, mp *x)
-{
-  x = MP_COPY(x);
-  if (d) MP_DROP(d);
-  return (x);
-}
+  { x = MP_COPY(x); if (d) MP_DROP(d); return (x); }
 
 /* --- @field_samep@ --- *
  *
@@ -86,9 +61,7 @@ mp *field_id(field *f, mp *d, mp *x)
  */
 
 int field_samep(field *f, field *g)
-{
-  return (f->ops == g->ops && F_SAMEP(f, g));
-}
+  { return (f == g || (f->ops == g->ops && F_SAMEP(f, g))); }
 
 /* --- @field_stdsamep@ --- *
  *
@@ -100,9 +73,6 @@ int field_samep(field *f, field *g)
  *		member.
  */
 
-int field_stdsamep(field *f, field *g)
-{
-  return (MP_EQ(f->m, g->m));
-}
+int field_stdsamep(field *f, field *g) { return (MP_EQ(f->m, g->m)); }
 
 /*----- That's all, folks -------------------------------------------------*/