Fossil

Check-in [871a949296]
Login

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

Overview
Comment:Error message changes: Omit the executable name at the beginning of error messages to the console, and try to make sure new error messages begin on a fresh line and do not overwrite prior status text.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 871a949296b6325c70fb1c9a229749f713278102
User & Date: drh 2013-02-21 14:39:30.053
Context
2013-02-21
14:54
Do not prompt for the sync password more than once. check-in: 1cd61c96bc user: drh tags: trunk
14:39
Error message changes: Omit the executable name at the beginning of error messages to the console, and try to make sure new error messages begin on a fresh line and do not overwrite prior status text. check-in: 871a949296 user: drh tags: trunk
14:24
Code refactoring: Move utility routines (ex: fossil_malloc()) out of main.c and into a new file util.c. Try to gather I/O routines into the printf.c source file. check-in: bb0cedb15a user: drh tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/printf.c.
923
924
925
926
927
928
929

930
931
932
933
934
935
936
937
#endif
  {
    if( g.cgiOutput && once ){
      once = 0;
      cgi_printf("<p class=\"generalError\">%h</p>", z);
      cgi_reply();
    }else if( !g.fQuiet ){

      fossil_trace("%s: %s\n", g.argv[0], z);
    }
  }
  free(z);
  db_force_rollback();
  fossil_exit(rc);
}








>
|







923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
#endif
  {
    if( g.cgiOutput && once ){
      once = 0;
      cgi_printf("<p class=\"generalError\">%h</p>", z);
      cgi_reply();
    }else if( !g.fQuiet ){
      fossil_force_newline();
      fossil_trace("Fossil internal error: %s\n", z);
    }
  }
  free(z);
  db_force_rollback();
  fossil_exit(rc);
}

954
955
956
957
958
959
960

961
962
963
964
965
966
967
968
#endif
  {
    if( g.cgiOutput ){
      g.cgiOutput = 0;
      cgi_printf("<p class=\"generalError\">\n%h\n</p>\n", z);
      cgi_reply();
    }else if( !g.fQuiet ){

      fossil_trace("%s: %s\n", g.argv[0], z);
    }
  }
  free(z);
  db_force_rollback();
  fossil_exit(rc);
}








>
|







955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
#endif
  {
    if( g.cgiOutput ){
      g.cgiOutput = 0;
      cgi_printf("<p class=\"generalError\">\n%h\n</p>\n", z);
      cgi_reply();
    }else if( !g.fQuiet ){
      fossil_force_newline();
      fossil_trace("%s\n", z);
    }
  }
  free(z);
  db_force_rollback();
  fossil_exit(rc);
}

994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
#endif
  {
    if( g.cgiOutput ){
      g.cgiOutput = 0;
      cgi_printf("<p class=\"generalError\">\n%h\n</p>\n", z);
      cgi_reply();
    }else{
      fossil_trace("%s: %s\n", g.argv[0], 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_trace("%s\n", z);
    }
  }
  db_force_rollback();
  fossil_exit(rc);
}


1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
    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: %s\n", g.argv[0], z);
    }
  }
  free(z);
}

/*
** Turn off any NL to CRNL translation on the stream given as an







|







1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
    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);
}

/*
** Turn off any NL to CRNL translation on the stream given as an