liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reduce scope of warning silencing

Browse Source
This commit is contained in:
heckflosse
2017-10-25 16:50:03 +02:00
parent fb02e6883e
commit 7b3c36c7c6
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtengine/cJSON.c
View File

@@ -31,7 +31,6 @@
#include <limits.h> #include <limits.h>
#include <ctype.h> #include <ctype.h>
#include "cJSON.h" #include "cJSON.h"
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
static const char *ep; static const char *ep;
@@ -192,12 +191,21 @@ static const char *parse_string(cJSON *item,const char *str)
len=4;if (uc<0x80) len=1;else if (uc<0x800) len=2;else if (uc<0x10000) len=3; ptr2+=len; len=4;if (uc<0x80) len=1;else if (uc<0x800) len=2;else if (uc<0x10000) len=3; ptr2+=len;
#ifdef __GNUC__ // silence warning
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#endif
switch (len) { switch (len) {
case 4: *--ptr2 =((uc | 0x80) & 0xBF); uc >>= 6; case 4: *--ptr2 =((uc | 0x80) & 0xBF); uc >>= 6;
case 3: *--ptr2 =((uc | 0x80) & 0xBF); uc >>= 6; case 3: *--ptr2 =((uc | 0x80) & 0xBF); uc >>= 6;
case 2: *--ptr2 =((uc | 0x80) & 0xBF); uc >>= 6; case 2: *--ptr2 =((uc | 0x80) & 0xBF); uc >>= 6;
case 1: *--ptr2 =(uc | firstByteMark[len]); case 1: *--ptr2 =(uc | firstByteMark[len]);
} }
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
ptr2+=len; ptr2+=len;
break; break;
default: *ptr2++=*ptr; break; default: *ptr2++=*ptr; break;