Fossil

Check-in [2091a11dd8]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Make sure warning and panic messages appear on a fresh line on the console.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 2091a11dd8c2c20a68be0afcdacda343413b22da
User & Date: drh 2013-02-21 15:50:00.949
Context
2013-02-21
15:51
merge fork check-in: 32bb8c2819 user: jan.nijtmans tags: trunk
15:50
Make sure warning and panic messages appear on a fresh line on the console. check-in: 2091a11dd8 user: drh tags: trunk
14:54
Do not prompt for the sync password more than once. check-in: 1cd61c96bc user: drh tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/printf.c.
996
997
998
999
1000
1001
1002

1003
1004
1005
1006
1007
1008
1009
#endif
  {
    if( g.cgiOutput ){
      g.cgiOutput = 0;
      cgi_printf("<p class=\"generalError\">\n%h\n</p>\n", z);
      cgi_reply();
    }else{

      fossil_trace("%s\n", z);
    }
  }
  db_force_rollback();
  fossil_exit(rc);
}








>







996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
#endif
  {
    if( g.cgiOutput ){
      g.cgiOutput = 0;
      cgi_printf("<p class=\"generalError\">\n%h\n</p>\n", z);
      cgi_reply();
    }else{
      fossil_force_newline();
      fossil_trace("%s\n", z);
    }
  }
  db_force_rollback();
  fossil_exit(rc);
}

1020
1021
1022
1023
1024
1025
1026

1027
1028
1029
1030
1031
1032
1033
    json_warn( FSL_JSON_W_UNKNOWN, z );
  }else
#endif
  {
    if( g.cgiOutput ){
      cgi_printf("<p class=\"generalError\">\n%h\n</p>\n", z);
    }else{

      fossil_trace("%s\n", z);
    }
  }
  free(z);
}

/*







>







1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
    json_warn( FSL_JSON_W_UNKNOWN, z );
  }else
#endif
  {
    if( g.cgiOutput ){
      cgi_printf("<p class=\"generalError\">\n%h\n</p>\n", z);
    }else{
      fossil_force_newline();
      fossil_trace("%s\n", z);
    }
  }
  free(z);
}

/*