mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 20:00:19 +02:00
Code Activity

Avoid type-limits warning in SCM_TO_TYPE_PROTO

Browse source 
* libguile/conv-uinteger.i.c (SCM_TO_TYPE_PROTO): avoid a comparison
  that is always true due to the limited range of the data type
This commit is contained in:
Michael Gran 2009-08-20 21:33:49 -07:00
parent 68a30f5730
commit 43d5626ce7
1 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
libguile/conv-uinteger.i.c
View file

@ -53,10 +53,17 @@ SCM_TO_TYPE_PROTO (SCM val)
#if SIZEOF_TYPE != 0 && SIZEOF_TYPE > SCM_SIZEOF_LONG #if SIZEOF_TYPE != 0 && SIZEOF_TYPE > SCM_SIZEOF_LONG
return n; return n;
#else #else
if (n >= TYPE_MIN && n <= TYPE_MAX)
return n; #if TYPE_MIN == 0
else if (n <= TYPE_MAX)
goto out_of_range; return n;
#else /* TYPE_MIN != 0 */
if (n >= TYPE_MIN && n <= TYPE_MAX)
return n;
#endif /* TYPE_MIN != 0 */
else
goto out_of_range;
#endif #endif
} }
else else
@ -76,10 +83,16 @@ SCM_TO_TYPE_PROTO (SCM val)
mpz_export (&n, &count, 1, sizeof (TYPE), 0, 0, SCM_I_BIG_MPZ (val)); mpz_export (&n, &count, 1, sizeof (TYPE), 0, 0, SCM_I_BIG_MPZ (val));
#if TYPE_MIN == 0
if (n <= TYPE_MAX)
return n;
#else /* TYPE_MIN != 0 */
if (n >= TYPE_MIN && n <= TYPE_MAX) if (n >= TYPE_MIN && n <= TYPE_MAX)
return n; return n;
else #endif /* TYPE_MIN != 0 */
goto out_of_range; else
goto out_of_range;
} }
} }
else else