From 40a74585000a0d67cb1a5d49b59db95934cc810c Mon Sep 17 00:00:00 2001 From: Alexei Podtelezhnikov Date: Wed, 22 Jan 2025 21:05:22 -0500 Subject: [PATCH] * src/bdf/bdflib.c (bdf_ato{i.ul.s.us}_]): Remove uncecessary checks. --- src/bdf/bdflib.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/src/bdf/bdflib.c b/src/bdf/bdflib.c index 5c6841c35..8d4a6e1ff 100644 --- a/src/bdf/bdflib.c +++ b/src/bdf/bdflib.c @@ -422,9 +422,6 @@ unsigned long v; - if ( s == NULL || *s == 0 ) - return 0; - for ( v = 0; sbitset( ddigits, *s ); s++ ) { if ( v < ( FT_ULONG_MAX - 9 ) / 10 ) @@ -447,16 +444,14 @@ long v, neg; - if ( s == NULL || *s == 0 ) - return 0; - /* Check for a minus sign. */ - neg = 0; if ( *s == '-' ) { s++; - neg = 1; + neg = -1; } + else + neg = 1; for ( v = 0; sbitset( ddigits, *s ); s++ ) { @@ -469,7 +464,7 @@ } } - return ( !neg ) ? v : -v; + return neg * v; } @@ -505,16 +500,14 @@ short v, neg; - if ( s == NULL || *s == 0 ) - return 0; - /* Check for a minus. */ - neg = 0; if ( *s == '-' ) { s++; - neg = 1; + neg = -1; } + else + neg = 1; for ( v = 0; sbitset( ddigits, *s ); s++ ) { @@ -527,7 +520,7 @@ } } - return (short)( ( !neg ) ? v : -v ); + return neg * v; } @@ -1845,7 +1838,7 @@ propid = ft_hash_str_lookup( name, font->internal ); - return propid ? ( font->props + *propid ) : 0; + return propid ? ( font->props + *propid ) : NULL; }