X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/92c2a29042b4e2b5b4429f9848dc22fd92acb0d8..95ccefe3ce59a0773f915aca6948d5b6f1f7c882:/mpint.c

diff --git a/mpint.c b/mpint.c
index 9355990..7c1b8cc 100644
--- a/mpint.c
+++ b/mpint.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: mpint.c,v 1.2 1999/12/10 23:22:53 mdw Exp $
+ * $Id: mpint.c,v 1.4 2004/04/08 01:36:15 mdw Exp $
  *
  * Conversion between MPs and standard C integers
  *
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,29 +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: mpint.c,v $
- * Revision 1.2  1999/12/10 23:22:53  mdw
- * Support for uint32.
- *
- * Revision 1.1  1999/11/25 11:38:31  mdw
- * Support for conversions between MPs and C integers.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "mpint.h"
@@ -95,7 +84,7 @@ static int fromuint(dstr *v)
   mp *d = mp_fromuint(MP_NEW, i);
   int ok = 1;
 
-  if (MP_CMP(d, !=, m)) {
+  if (!MP_EQ(d, m)) {
     fputs("\n*** fromint failed.\n", stderr);
     fprintf(stderr, "i = %lu", i);
     fputs("\nexpect = ", stderr); mp_writefile(m, stderr, 10);
@@ -117,7 +106,7 @@ static int fromint(dstr *v)
   mp *d = mp_fromint(MP_NEW, i);
   int ok = 1;
 
-  if (MP_CMP(d, !=, m)) {
+  if (!MP_EQ(d, m)) {
     fputs("\n*** fromint failed.\n", stderr);
     fprintf(stderr, "i = %li", i);
     fputs("\nexpect = ", stderr); mp_writefile(m, stderr, 10);
@@ -139,7 +128,7 @@ static int touint(dstr *v)
   unsigned j = mp_touint(m);
   int ok = 1;
 
-  if (i != j) {
+  if ((unsigned)i != j) {
     fputs("\n*** touint failed.\n", stderr);
     fputs("m = ", stderr); mp_writefile(m, stderr, 10);
     fprintf(stderr, "\nexpect = %lu; result = %u\n", i, j);