From 21ca7d8264a18bf7a6198b3b144f7d3b92e3229c Mon Sep 17 00:00:00 2001 From: Felix von Leitner Date: Fri, 14 Mar 2014 00:25:33 +0000 Subject: [PATCH] remove compiler warnings --- fmt/fmt_8long.c | 2 +- fmt/fmt_8longlong.c | 2 +- fmt/fmt_escapecharc.c | 6 +++--- fmt/fmt_escapecharjson.c | 6 +++--- fmt/fmt_fill.c | 2 +- fmt/fmt_httpdate.c | 4 ++-- fmt/fmt_human.c | 4 ++-- fmt/fmt_humank.c | 2 +- fmt/fmt_long.c | 4 ++-- fmt/fmt_pad.c | 2 +- fmt/fmt_strn.c | 2 +- fmt/fmt_tohex.c | 2 +- fmt/fmt_ulong.c | 2 +- fmt/fmt_ulonglong.c | 2 +- fmt/fmt_xlong.c | 2 +- fmt/fmt_xlonglong.c | 2 +- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/fmt/fmt_8long.c b/fmt/fmt_8long.c index 7660a6a..2593f15 100644 --- a/fmt/fmt_8long.c +++ b/fmt/fmt_8long.c @@ -6,7 +6,7 @@ size_t fmt_8long(char *dest,unsigned long i) { for (len=1, tmp=i; tmp>7; ++len) tmp>>=3; if (dest) for (tmp=i, dest+=len; ; ) { - *--dest = (tmp&7)+'0'; + *--dest = (char)((tmp&7)+'0'); if (!(tmp>>=3)) break; } return len; diff --git a/fmt/fmt_8longlong.c b/fmt/fmt_8longlong.c index 027c97b..bcb2ec7 100644 --- a/fmt/fmt_8longlong.c +++ b/fmt/fmt_8longlong.c @@ -7,7 +7,7 @@ size_t fmt_8longlong(char *dest,unsigned long long i) { for (len=1, tmp=i; tmp>7; ++len) tmp>>=3; if (dest) for (tmp=i, dest+=len; ; ) { - *--dest = (tmp&7)+'0'; + *--dest = (char)((tmp&7)+'0'); if (!(tmp>>=3)) break; } return len; diff --git a/fmt/fmt_escapecharc.c b/fmt/fmt_escapecharc.c index 887c1f9..5e14205 100644 --- a/fmt/fmt_escapecharc.c +++ b/fmt/fmt_escapecharc.c @@ -1,9 +1,9 @@ #include "fmt.h" static void fmt_oct3(char* dest,uint8_t w) { - dest[2]=(w&7)+'0'; w>>=3; - dest[1]=(w&7)+'0'; w>>=3; - dest[0]=(w&7)+'0'; + dest[2]=(char)((w&7)+'0'); w>>=3; + dest[1]=(char)((w&7)+'0'); w>>=3; + dest[0]=(char)((w&7)+'0'); } size_t fmt_escapecharc(char* dest,uint32_t ch) { diff --git a/fmt/fmt_escapecharjson.c b/fmt/fmt_escapecharjson.c index ee7cccd..7a39ef0 100644 --- a/fmt/fmt_escapecharjson.c +++ b/fmt/fmt_escapecharjson.c @@ -22,7 +22,7 @@ size_t fmt_escapecharjson(char* dest,uint32_t ch) { simple: if (dest) { dest[0]='\\'; - dest[1]=ch; + dest[1]=(char)ch; } return 2; } @@ -31,7 +31,7 @@ simple: if (dest) { dest[0]='\\'; dest[1]='u'; - fmt_hex4(dest+2,0xd800 | (((ch-0x10000)>>10)&0x3ff)); + fmt_hex4(dest+2,(uint16_t)(0xd800 | (((ch-0x10000)>>10)&0x3ff))); dest+=6; } ch=(ch&0x3ff)|0xdc00; @@ -41,7 +41,7 @@ simple: if (dest) { dest[0]='\\'; dest[1]='u'; - fmt_hex4(dest+2,ch); + fmt_hex4(dest+2,(uint16_t)ch); } return n+6; } diff --git a/fmt/fmt_fill.c b/fmt/fmt_fill.c index bacc06e..bc74ba4 100644 --- a/fmt/fmt_fill.c +++ b/fmt/fmt_fill.c @@ -19,5 +19,5 @@ size_t fmt_fill(char* dest,size_t srclen,size_t padlen,size_t maxlen) { if (dest>max) break; *dest=' '; ++dest; } - return dest-olddest; + return (size_t)(dest-olddest); } diff --git a/fmt/fmt_httpdate.c b/fmt/fmt_httpdate.c index ba99dde..7ccbe80 100644 --- a/fmt/fmt_httpdate.c +++ b/fmt/fmt_httpdate.c @@ -3,8 +3,8 @@ #include static unsigned int fmt_2digits(char* dest,int i) { - dest[0]=(i/10)+'0'; - dest[1]=(i%10)+'0'; + dest[0]=(char)((i/10)+'0'); + dest[1]=(char)((i%10)+'0'); return 2; } diff --git a/fmt/fmt_human.c b/fmt/fmt_human.c index 585ed9e..2115023 100644 --- a/fmt/fmt_human.c +++ b/fmt/fmt_human.c @@ -2,7 +2,7 @@ size_t fmt_human(char* dest,unsigned long long l) { char unit; - int i; + size_t i; if (l<1000) return fmt_ulong(dest,l); if (l>1000000000000ull) { /* dang! overflow! */ @@ -22,7 +22,7 @@ size_t fmt_human(char* dest,unsigned long long l) { if (!dest) return fmt_ulong(0,l)+2; i=fmt_ulong(dest,l/10); dest[i]='.'; - dest[i+1]=(l%10)+'0'; + dest[i+1]=(char)((l%10)+'0'); dest[i+2]=unit; return i+3; } diff --git a/fmt/fmt_humank.c b/fmt/fmt_humank.c index 7b398a0..f325ed2 100644 --- a/fmt/fmt_humank.c +++ b/fmt/fmt_humank.c @@ -20,7 +20,7 @@ size_t fmt_humank(char* dest,unsigned long long l) { if (!dest) return fmt_ulong(0,l)+2; i=fmt_ulong(dest,l/10); dest[i]='.'; - dest[i+1]=(l%10)+'0'; + dest[i+1]=(char)((l%10)+'0'); dest[i+2]=unit; return i+3; } diff --git a/fmt/fmt_long.c b/fmt/fmt_long.c index f5c1d25..0162c4e 100644 --- a/fmt/fmt_long.c +++ b/fmt/fmt_long.c @@ -3,7 +3,7 @@ size_t fmt_long(char *dest,long int i) { if (i<0) { if (dest) *dest++='-'; - return fmt_ulong(dest,-i)+1; + return fmt_ulong(dest,(unsigned long)-i)+1; } else - return fmt_ulong(dest,i); + return fmt_ulong(dest,(unsigned long)i); } diff --git a/fmt/fmt_pad.c b/fmt/fmt_pad.c index 71201f1..23e8cbd 100644 --- a/fmt/fmt_pad.c +++ b/fmt/fmt_pad.c @@ -18,7 +18,7 @@ size_t fmt_pad(char* dest,const char* src,size_t srclen,size_t padlen,size_t max if (dest>max) break; *dest=' '; ++dest; } - for (todo=(long)srclen>maxlen?maxlen:srclen; todo>0; --todo) { + for (todo=(long)(srclen>maxlen?maxlen:srclen); todo>0; --todo) { if (dest>max) break; *dest=*src; ++dest; ++src; } diff --git a/fmt/fmt_strn.c b/fmt/fmt_strn.c index 2a58330..ca4a14a 100644 --- a/fmt/fmt_strn.c +++ b/fmt/fmt_strn.c @@ -10,5 +10,5 @@ size_t fmt_strn(char *out,const char *in,size_t limit) { if (!*t || t==u) break; if (s) { *s=*t; ++s; } ++t; if (!*t || t==u) break; if (s) { *s=*t; ++s; } ++t; } - return t-in; + return (size_t)(t-in); } diff --git a/fmt/fmt_tohex.c b/fmt/fmt_tohex.c index a473d28..1f68704 100644 --- a/fmt/fmt_tohex.c +++ b/fmt/fmt_tohex.c @@ -1,6 +1,6 @@ #include "fmt.h" char fmt_tohex(char c) { - return c>=10?c-10+'a':c+'0'; + return (char)(c>=10?c-10+'a':c+'0'); } diff --git a/fmt/fmt_ulong.c b/fmt/fmt_ulong.c index 46cbcf2..d89fb5b 100644 --- a/fmt/fmt_ulong.c +++ b/fmt/fmt_ulong.c @@ -6,6 +6,6 @@ size_t fmt_ulong(char *dest,unsigned long i) { for (len=1, tmp=i; tmp>9; ++len) tmp/=10; if (dest) for (tmp=i, dest+=len, len2=len+1; --len2; tmp/=10) - *--dest = (tmp%10)+'0'; + *--dest = (char)((tmp%10)+'0'); return len; } diff --git a/fmt/fmt_ulonglong.c b/fmt/fmt_ulonglong.c index be93e45..704953d 100644 --- a/fmt/fmt_ulonglong.c +++ b/fmt/fmt_ulonglong.c @@ -7,6 +7,6 @@ size_t fmt_ulonglong(char *dest,unsigned long long int i) { for (len=1, tmp=i; tmp>9; ++len) tmp/=10; if (dest) for (tmp=i, dest+=len, len2=len+1; --len2; tmp/=10) - *--dest = (tmp%10)+'0'; + *--dest = (char)((tmp%10)+'0'); return len; } diff --git a/fmt/fmt_xlong.c b/fmt/fmt_xlong.c index 6612722..44723c4 100644 --- a/fmt/fmt_xlong.c +++ b/fmt/fmt_xlong.c @@ -2,7 +2,7 @@ #include "haveinline.h" static inline char tohex(char c) { - return c>=10?c-10+'a':c+'0'; + return (char)(c>=10?c-10+'a':c+'0'); } size_t fmt_xlong(char *dest,unsigned long i) { diff --git a/fmt/fmt_xlonglong.c b/fmt/fmt_xlonglong.c index 2920712..113ef93 100644 --- a/fmt/fmt_xlonglong.c +++ b/fmt/fmt_xlonglong.c @@ -1,7 +1,7 @@ #include "fmt.h" static inline char tohex(char c) { - return c>=10?c-10+'a':c+'0'; + return (char)(c>=10?c-10+'a':c+'0'); } size_t fmt_xlonglong(char *dest,unsigned long long i) {