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

diff --git a/field.c b/field.c
index c8e31d2..8fb1ad6 100644
--- a/field.c
+++ b/field.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: field.c,v 1.4 2004/04/08 01:36:15 mdw Exp $
+ * $Id$
  *
  * Abstract field operations
  *
  * (c) 2001 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,
@@ -47,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@ --- *
  *
@@ -65,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@ --- *
  *
@@ -79,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 -------------------------------------------------*/