Fossil

Differences From Artifact [037ded79e2]:

• File src/db.c — part of check-in [2a0c020313] at 2020-06-09 17:50:57 on branch trunk — Make db_stats() conditional on the appropriate global option. (user: mistachkin size: 134539) [more...]

To Artifact [ab9aa74bcf]:

• File src/db.c — part of check-in [2e4238368e] at 2020-06-11 22:38:27 on branch jsonTestsPass — Experimental changes to get JSON tests passing. (user: mistachkin size: 134600)

76
77
78
79
80
81
82

83
84
85
86
87
88
89

  va_list ap;
  char *z;
  va_start(ap, zFormat);
  z = vmprintf(zFormat, ap);
  va_end(ap);
#ifdef FOSSIL_ENABLE_JSON
  if( g.json.isJsonMode ){

    json_err( 0, z, 1 );
  }
  else
#endif /* FOSSIL_ENABLE_JSON */
  if( g.xferPanic && g.cgiOutput==1 ){
    cgi_reset_content();
    @ error Database\serror:\s%F(z)

>

76
77
78
79
80
81
82
83
84
85
86
87
88
89
90

  va_list ap;
  char *z;
  va_start(ap, zFormat);
  z = vmprintf(zFormat, ap);
  va_end(ap);
#ifdef FOSSIL_ENABLE_JSON
  if( g.json.isJsonMode ){
    if( !json_is_main_boostrapped() ) json_main_bootstrap();
    json_err( 0, z, 1 );
  }
  else
#endif /* FOSSIL_ENABLE_JSON */
  if( g.xferPanic && g.cgiOutput==1 ){
    cgi_reset_content();
    @ error Database\serror:\s%F(z)