Fossil SCM
Fix error when compiling with JSON support enabled (TODO: review semantics to preserve JSON error handling).
Commit
f430f6234abb45c49c0a4c751fd144ef81f5b981fee8737378a392cbadc77b3d
Parent
32641d15d8282c5…
1 file changed
-5
M
src/db.c
-5
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -70,23 +70,18 @@ | ||
| 70 | 70 | |
| 71 | 71 | /* |
| 72 | 72 | ** Call this routine when a database error occurs. |
| 73 | 73 | */ |
| 74 | 74 | static void db_err(const char *zFormat, ...){ |
| 75 | - static int rcLooping = 0; | |
| 76 | 75 | va_list ap; |
| 77 | 76 | char *z; |
| 78 | - if( rcLooping ) exit(rcLooping); | |
| 79 | 77 | va_start(ap, zFormat); |
| 80 | 78 | z = vmprintf(zFormat, ap); |
| 81 | 79 | va_end(ap); |
| 82 | 80 | #ifdef FOSSIL_ENABLE_JSON |
| 83 | 81 | if( g.json.isJsonMode ){ |
| 84 | 82 | json_err( 0, z, 1 ); |
| 85 | - if( g.isHTTP ){ | |
| 86 | - rc = 0 /* avoid HTTP 500 */; | |
| 87 | - } | |
| 88 | 83 | } |
| 89 | 84 | else |
| 90 | 85 | #endif /* FOSSIL_ENABLE_JSON */ |
| 91 | 86 | if( g.xferPanic && g.cgiOutput==1 ){ |
| 92 | 87 | cgi_reset_content(); |
| 93 | 88 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -70,23 +70,18 @@ | |
| 70 | |
| 71 | /* |
| 72 | ** Call this routine when a database error occurs. |
| 73 | */ |
| 74 | static void db_err(const char *zFormat, ...){ |
| 75 | static int rcLooping = 0; |
| 76 | va_list ap; |
| 77 | char *z; |
| 78 | if( rcLooping ) exit(rcLooping); |
| 79 | va_start(ap, zFormat); |
| 80 | z = vmprintf(zFormat, ap); |
| 81 | va_end(ap); |
| 82 | #ifdef FOSSIL_ENABLE_JSON |
| 83 | if( g.json.isJsonMode ){ |
| 84 | json_err( 0, z, 1 ); |
| 85 | if( g.isHTTP ){ |
| 86 | rc = 0 /* avoid HTTP 500 */; |
| 87 | } |
| 88 | } |
| 89 | else |
| 90 | #endif /* FOSSIL_ENABLE_JSON */ |
| 91 | if( g.xferPanic && g.cgiOutput==1 ){ |
| 92 | cgi_reset_content(); |
| 93 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -70,23 +70,18 @@ | |
| 70 | |
| 71 | /* |
| 72 | ** Call this routine when a database error occurs. |
| 73 | */ |
| 74 | static void db_err(const char *zFormat, ...){ |
| 75 | va_list ap; |
| 76 | char *z; |
| 77 | va_start(ap, zFormat); |
| 78 | z = vmprintf(zFormat, ap); |
| 79 | va_end(ap); |
| 80 | #ifdef FOSSIL_ENABLE_JSON |
| 81 | if( g.json.isJsonMode ){ |
| 82 | json_err( 0, z, 1 ); |
| 83 | } |
| 84 | else |
| 85 | #endif /* FOSSIL_ENABLE_JSON */ |
| 86 | if( g.xferPanic && g.cgiOutput==1 ){ |
| 87 | cgi_reset_content(); |
| 88 |