Fossil SCM
fixed comparison logic which broken dumbing-down of error codes (caused them to never be dumbed-down).
Commit
f93e059f6c408c4ca818b991b228b50504719383
Parent
8f12ac9896a9cad…
1 file changed
+3
-1
+3
-1
| --- src/json.c | ||
| +++ src/json.c | ||
| @@ -1236,11 +1236,13 @@ | ||
| 1236 | 1236 | ** |
| 1237 | 1237 | ** Note that WARNING codes (1..999) are never dumbed down. |
| 1238 | 1238 | ** |
| 1239 | 1239 | */ |
| 1240 | 1240 | static int json_dumbdown_rc( int code ){ |
| 1241 | - if(!code || ((code>FSL_JSON_W_START) && (code>FSL_JSON_W_END))){ | |
| 1241 | + if(!g.json.errorDetailParanoia | |
| 1242 | + || !code | |
| 1243 | + || ((code>=FSL_JSON_W_START) && (code<FSL_JSON_W_END))){ | |
| 1242 | 1244 | return code; |
| 1243 | 1245 | }else{ |
| 1244 | 1246 | int modulo = 0; |
| 1245 | 1247 | assert((code >= 1000) && (code <= 9999) && "Invalid Fossil/JSON code."); |
| 1246 | 1248 | switch( g.json.errorDetailParanoia ){ |
| 1247 | 1249 |
| --- src/json.c | |
| +++ src/json.c | |
| @@ -1236,11 +1236,13 @@ | |
| 1236 | ** |
| 1237 | ** Note that WARNING codes (1..999) are never dumbed down. |
| 1238 | ** |
| 1239 | */ |
| 1240 | static int json_dumbdown_rc( int code ){ |
| 1241 | if(!code || ((code>FSL_JSON_W_START) && (code>FSL_JSON_W_END))){ |
| 1242 | return code; |
| 1243 | }else{ |
| 1244 | int modulo = 0; |
| 1245 | assert((code >= 1000) && (code <= 9999) && "Invalid Fossil/JSON code."); |
| 1246 | switch( g.json.errorDetailParanoia ){ |
| 1247 |
| --- src/json.c | |
| +++ src/json.c | |
| @@ -1236,11 +1236,13 @@ | |
| 1236 | ** |
| 1237 | ** Note that WARNING codes (1..999) are never dumbed down. |
| 1238 | ** |
| 1239 | */ |
| 1240 | static int json_dumbdown_rc( int code ){ |
| 1241 | if(!g.json.errorDetailParanoia |
| 1242 | || !code |
| 1243 | || ((code>=FSL_JSON_W_START) && (code<FSL_JSON_W_END))){ |
| 1244 | return code; |
| 1245 | }else{ |
| 1246 | int modulo = 0; |
| 1247 | assert((code >= 1000) && (code <= 9999) && "Invalid Fossil/JSON code."); |
| 1248 | switch( g.json.errorDetailParanoia ){ |
| 1249 |