From a9ca21ffc9e6264f0c03cb3fa83aa02021d94856 Mon Sep 17 00:00:00 2001 From: leitner Date: Fri, 14 Mar 2014 18:01:02 +0000 Subject: [PATCH] remove compiler warnings --- uint/uint16_pack.c | 4 ++-- uint/uint16_pack_big.c | 4 ++-- uint/uint16_read.c | 2 +- uint/uint16_read_big.c | 2 +- uint/uint16_unpack.c | 2 +- uint/uint16_unpack_big.c | 2 +- uint/uint32_pack.c | 8 ++++---- uint/uint32_pack_big.c | 8 ++++---- uint/uint64_pack.c | 2 +- uint/uint64_pack_big.c | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/uint/uint16_pack.c b/uint/uint16_pack.c index 9c71dc6..6ff3c59 100644 --- a/uint/uint16_pack.c +++ b/uint/uint16_pack.c @@ -2,6 +2,6 @@ #include "uint16.h" void uint16_pack(char *out,uint16 in) { - out[0]=in&255; - out[1]=in>>8; + out[0]=(char)in; + out[1]=(char)(in>>8); } diff --git a/uint/uint16_pack_big.c b/uint/uint16_pack_big.c index 969b9f3..11791e4 100644 --- a/uint/uint16_pack_big.c +++ b/uint/uint16_pack_big.c @@ -2,6 +2,6 @@ #include "uint16.h" void uint16_pack_big(char *out,uint16 in) { - out[0]=in>>8; - out[1]=in&255; + out[0]=(char)(in>>8); + out[1]=(char)in; } diff --git a/uint/uint16_read.c b/uint/uint16_read.c index d190d09..6e21120 100644 --- a/uint/uint16_read.c +++ b/uint/uint16_read.c @@ -2,5 +2,5 @@ #include "uint16.h" uint16 uint16_read(const char *in) { - return ((unsigned short)((unsigned char) in[1]) << 8) + (unsigned char)in[0]; + return (unsigned short)((((unsigned char) in[1]) << 8) | (unsigned char)in[0]); } diff --git a/uint/uint16_read_big.c b/uint/uint16_read_big.c index 271afca..d05d1d8 100644 --- a/uint/uint16_read_big.c +++ b/uint/uint16_read_big.c @@ -2,5 +2,5 @@ #include "uint16.h" uint16 uint16_read_big(const char *in) { - return ((unsigned short)((unsigned char) in[0]) << 8) + (unsigned char)in[1]; + return (unsigned short)((((unsigned char) in[0]) << 8) + (unsigned char)in[1]); } diff --git a/uint/uint16_unpack.c b/uint/uint16_unpack.c index 7716a7c..ea2bd07 100644 --- a/uint/uint16_unpack.c +++ b/uint/uint16_unpack.c @@ -2,5 +2,5 @@ #include "uint16.h" void uint16_unpack(const char *in,uint16 *out) { - *out = ((unsigned short)((unsigned char) in[1]) << 8) + (unsigned char)in[0]; + *out = (unsigned short)((((unsigned char) in[1]) << 8) + (unsigned char)in[0]); } diff --git a/uint/uint16_unpack_big.c b/uint/uint16_unpack_big.c index 5763e2b..aa6a54b 100644 --- a/uint/uint16_unpack_big.c +++ b/uint/uint16_unpack_big.c @@ -2,5 +2,5 @@ #include "uint16.h" void uint16_unpack_big(const char *in,uint16 *out) { - *out = ((unsigned short)((unsigned char) in[0]) << 8) + (unsigned char)in[1]; + *out = (unsigned short)((((unsigned char) in[0]) << 8) + (unsigned char)in[1]); } diff --git a/uint/uint32_pack.c b/uint/uint32_pack.c index 5590e8e..71f0b40 100644 --- a/uint/uint32_pack.c +++ b/uint/uint32_pack.c @@ -2,8 +2,8 @@ #include "uint32.h" void uint32_pack(char *out,uint32 in) { - *out=in&0xff; in>>=8; - *++out=in&0xff; in>>=8; - *++out=in&0xff; in>>=8; - *++out=in&0xff; + *out=(char)in; in>>=8; + *++out=(char)in; in>>=8; + *++out=(char)in; in>>=8; + *++out=(char)in; } diff --git a/uint/uint32_pack_big.c b/uint/uint32_pack_big.c index 094ae6d..e6c47cb 100644 --- a/uint/uint32_pack_big.c +++ b/uint/uint32_pack_big.c @@ -2,8 +2,8 @@ #include "uint32.h" void uint32_pack_big(char *out,uint32 in) { - out[3]=in&0xff; in>>=8; - out[2]=in&0xff; in>>=8; - out[1]=in&0xff; in>>=8; - out[0]=in&0xff; + out[3]=(char)in; in>>=8; + out[2]=(char)in; in>>=8; + out[1]=(char)in; in>>=8; + out[0]=(char)in; } diff --git a/uint/uint64_pack.c b/uint/uint64_pack.c index bb9a8ba..38663aa 100644 --- a/uint/uint64_pack.c +++ b/uint/uint64_pack.c @@ -4,5 +4,5 @@ void uint64_pack(char *out,uint64 in) { uint32_pack(out,in&0xffffffff); - uint32_pack(out+4,in>>32); + uint32_pack(out+4,(uint32)(in>>32)); } diff --git a/uint/uint64_pack_big.c b/uint/uint64_pack_big.c index 7948bc6..5ffdd10 100644 --- a/uint/uint64_pack_big.c +++ b/uint/uint64_pack_big.c @@ -3,6 +3,6 @@ #include "uint32.h" void uint64_pack_big(char *out,uint64 in) { - uint32_pack_big(out,in>>32); + uint32_pack_big(out,(uint32)(in>>32)); uint32_pack_big(out+4,in&0xffffffff); }