From dba47741bf6817c4c5f19eedeb590539e854fb4d Mon Sep 17 00:00:00 2001 From: leitner Date: Sun, 30 Apr 2017 20:22:21 +0000 Subject: [PATCH] remove new compiler warnings from gcc 7 --- ent.c | 1 + scan/scan_double.c | 4 ++-- scan/scan_int.c | 2 +- scan/scan_longn.c | 2 +- scan/scan_plusminus.c | 2 +- scan/scan_short.c | 2 +- t.c | 1 + textcode/fmt_yenc.c | 1 + 8 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ent.c b/ent.c index 6d309ff..26c9c8c 100644 --- a/ent.c +++ b/ent.c @@ -8,6 +8,7 @@ #include "scan/scan_ulong.c" #include "scan/scan_ulongn.c" #include "fmt/fmt_utf8.c" +#include "fmt/fmt_tohex.c" #include "fmt/fmt_escapecharc.c" char tmp[20]; diff --git a/scan/scan_double.c b/scan/scan_double.c index 864900e..6680487 100644 --- a/scan/scan_double.c +++ b/scan/scan_double.c @@ -11,7 +11,7 @@ size_t scan_double(const char *in, double *dest) { register const char *c=in; char neg=0; switch (*c) { - case '-': neg=1; + case '-': neg=1; /* fall through */ case '+': c++; break; default: break; } @@ -31,7 +31,7 @@ size_t scan_double(const char *in, double *dest) { char neg=0; if (c[1]<'0') { switch (*c) { - case '-': neg=1; + case '-': neg=1; /* fall through */ case '+': c++; break; default: d=0; diff --git a/scan/scan_int.c b/scan/scan_int.c index f314a17..7b03548 100644 --- a/scan/scan_int.c +++ b/scan/scan_int.c @@ -10,7 +10,7 @@ size_t scan_int(const char* src,int* dest) { int ok; tmp=src; l=0; ok=0; neg=0; switch (*tmp) { - case '-': neg=1; + case '-': neg=1; /* fall through */ case '+': ++tmp; } while ((c=(unsigned char)(*tmp-'0'))<10) { diff --git a/scan/scan_longn.c b/scan/scan_longn.c index ae996b3..5543e69 100644 --- a/scan/scan_longn.c +++ b/scan/scan_longn.c @@ -11,7 +11,7 @@ size_t scan_longn(const char *src,size_t n,long *dest) { if (!n--) return 0; tmp=src; l=0; ok=0; neg=0; switch (*tmp) { - case '-': neg=1; + case '-': neg=1; /* fall through */ case '+': ++tmp; } while (n-->0 && (c=(unsigned char)(*tmp-'0'))<10) { diff --git a/scan/scan_plusminus.c b/scan/scan_plusminus.c index 2ebe871..3916208 100644 --- a/scan/scan_plusminus.c +++ b/scan/scan_plusminus.c @@ -3,7 +3,7 @@ size_t scan_plusminus(const char *src,signed int *dest) { *dest=1; switch (*src) { - case '-': *dest=-1; + case '-': *dest=-1; /* fall through */ case '+': return 1; break; } return 0; diff --git a/scan/scan_short.c b/scan/scan_short.c index 45e5091..b35a0aa 100644 --- a/scan/scan_short.c +++ b/scan/scan_short.c @@ -10,7 +10,7 @@ size_t scan_short(const char* src,short* dest) { int ok; tmp=src; l=0; ok=neg=0; switch (*tmp) { - case '-': neg=1; + case '-': neg=1; /* fall through */ case '+': ++tmp; } while ((c=(unsigned char)(*tmp-'0'))<10) { diff --git a/t.c b/t.c index ebbf319..fd773f5 100644 --- a/t.c +++ b/t.c @@ -126,6 +126,7 @@ int main(int argc,char* argv[]) { (void)writecb; (void)argc; (void)argv; + (void)c; assert(fmt_jsonescape(buf,"foo\nbar\\",8)==10 && byte_equal(buf,10,"foo\\nbar\\\\")); memset(buf,0,sizeof(buf)); assert(scan_jsonescape("foo\\u000abar\\\\",buf,&l)==14 && l==8 && byte_equal(buf,8,"foo\nbar\\")); diff --git a/textcode/fmt_yenc.c b/textcode/fmt_yenc.c index 95eb708..3d0ae81 100644 --- a/textcode/fmt_yenc.c +++ b/textcode/fmt_yenc.c @@ -16,6 +16,7 @@ size_t fmt_yenc(char* dest,const char* src,size_t len) { goto dontescape; case 'F': /* escape "^From " */ if (s[i+1]+42!='r' || s[i+2]+42!='o' || s[i+3]+42!='m' || s[i+4]+42!=' ') goto dontescape; + /* fall through */ case '.': /* dot at start of line needs to be escaped */ if (!linelen) goto dontescape; /* fall through */