Fixed bug which would cause splint to crash if it was started with the -i flags and...

[splint.git] / src / cprim.c

diff --git a/src/cprim.c b/src/cprim.c
index 8b1583262ea005b7c86ba9560864d0612fce1a5d..9f751193c05e66d892f55ce240f5f6f5fd097b75 100644 (file)
--- a/src/cprim.c
+++ b/src/cprim.c
@@ -17,15 +17,15 @@
 ** the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 ** MA 02111-1307, USA.
 **
-** For information on lclint: lclint-request@cs.virginia.edu
-** To report a bug: lclint-bug@cs.virginia.edu
+** For information on splint: info@splint.org
+** To report a bug: splint-bug@splint.org
 ** For more information: http://www.splint.org
 */
 /*
 ** cprim.c
 */
 
-# include "lclintMacros.nf"
+# include "splintMacros.nf"
 # include "basic.h"
 
 static bool cprim_isReal (cprim c)
@@ -109,8 +109,16 @@ cprim_closeEnoughAux (cprim c1, cprim c2, bool deep)
       if (context_getFlag (FLG_MATCHANYINTEGRAL)
          || context_getFlag (FLG_IGNOREQUALS))
        {
-         return (cprim_isAnyInt (c2)
-                 || (cprim_isAnyChar (c2) && context_msgCharInt ()));
+         if (context_getFlag (FLG_IGNORESIGNS)) 
+           {
+             return (cprim_isAnyUnsignedInt (c2)
+                     || (cprim_isUnsignedChar (c2) && context_msgCharInt ()));
+           }
+         else
+           {
+             return (cprim_isAnyInt (c2)
+                     || (cprim_isAnyChar (c2) && context_msgCharInt ()));
+           }
        }
       else if (context_getFlag (FLG_LONGUNSIGNEDUNSIGNEDINTEGRAL))
        {