From 7ef6b9c0996bf3d89755f87b2ba00ff6103dd7d0 Mon Sep 17 00:00:00 2001 From: giraffedata Date: Wed, 30 Mar 2022 02:51:51 +0000 Subject: Clean up type coercions git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4321 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- lib/pmfileio.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'lib/pmfileio.c') diff --git a/lib/pmfileio.c b/lib/pmfileio.c index 1ed71f18..1109f340 100644 --- a/lib/pmfileio.c +++ b/lib/pmfileio.c @@ -633,8 +633,8 @@ pm_readbigshort(FILE * const ifP, unsigned short s; - s = getcNofail(ifP) << 8; - s |= getcNofail(ifP) << 0; + s = (unsigned short)getcNofail(ifP) << 8; + s |= (unsigned short)getcNofail(ifP) << 0; *sP = s; @@ -661,10 +661,10 @@ pm_readbiglong(FILE * const ifP, unsigned long l; - l = getcNofail(ifP) << 24; - l |= getcNofail(ifP) << 16; - l |= getcNofail(ifP) << 8; - l |= getcNofail(ifP) << 0; + l = (unsigned long)getcNofail(ifP) << 24ul; + l |= (unsigned long)getcNofail(ifP) << 16ul; + l |= (unsigned long)getcNofail(ifP) << 8ul; + l |= (unsigned long)getcNofail(ifP) << 0ul; *lP = l; @@ -709,8 +709,8 @@ pm_readlittleshort(FILE * const ifP, short * const sP) { unsigned short s; - s = getcNofail(ifP) << 0; - s |= getcNofail(ifP) << 8; + s = (unsigned short)getcNofail(ifP) << 0; + s |= (unsigned short)getcNofail(ifP) << 8; *sP = s; @@ -736,10 +736,10 @@ pm_readlittlelong(FILE * const ifP, long * const lP) { unsigned long l; - l = getcNofail(ifP) << 0; - l |= getcNofail(ifP) << 8; - l |= getcNofail(ifP) << 16; - l |= getcNofail(ifP) << 24; + l = (unsigned long)getcNofail(ifP) << 0ul; + l |= (unsigned long)getcNofail(ifP) << 8ul; + l |= (unsigned long)getcNofail(ifP) << 16ul; + l |= (unsigned long)getcNofail(ifP) << 24ul; *lP = l; -- cgit 1.4.1