diff options
| author |  Adam Chlipala <adam@chlipala.net> | 2013-10-10 18:31:10 -0400 |
|---|---|---|
| committer | Adam Chlipala <adam@chlipala.net> | 2013-10-10 18:31:10 -0400 |
| commit | b877e9c099be92c78a439e9e9cb6553467f28237 (patch) | |
| tree | 08d5312366dba0153438c5c857ead3d0d93e696c | |
| parent | 71c58074582c14d4ff6ba38f60be80dad0e36be5 (diff) | |
Remove uw_cutErrorLocation() hijinks
| -rw-r--r-- | include/urweb/urweb.h | 2 | ||||
| -rw-r--r-- | src/c/urweb.c | 10 | ||||
| -rw-r--r-- | src/cjr_print.sml | 12 |
3 files changed, 5 insertions, 19 deletions
diff --git a/include/urweb/urweb.h b/include/urweb/urweb.h index 2db8b095..ce5c5734 100644 --- a/include/urweb/urweb.h +++ b/include/urweb/urweb.h @@ -351,8 +351,6 @@ void uw_isPost(uw_context); uw_Basis_bool uw_Basis_currentUrlHasPost(uw_context); uw_Basis_bool uw_Basis_currentUrlHasQueryString(uw_context); -void uw_cutErrorLocation(char *); - uw_Basis_string uw_Basis_fresh(uw_context); uw_Basis_float uw_Basis_floatFromInt(uw_context, uw_Basis_int); diff --git a/src/c/urweb.c b/src/c/urweb.c index e4aff33b..447733be 100644 --- a/src/c/urweb.c +++ b/src/c/urweb.c @@ -4103,16 +4103,6 @@ void uw_mayReturnIndirectly(uw_context ctx) { ctx->allowed_to_return_indirectly = 1; } -void uw_cutErrorLocation(char *s) { - char *s2; - - s2 = strstr(s, ": "); - if (s2 == NULL || strcspn(s, "<&") < s2 - s) - return; - - memmove(s, s2+2, strlen(s2+2)+1); -} - uw_Basis_string uw_Basis_fresh(uw_context ctx) { int len; char *r; diff --git a/src/cjr_print.sml b/src/cjr_print.sml index d2f77a36..bc8f1be6 100644 --- a/src/cjr_print.sml +++ b/src/cjr_print.sml @@ -1617,8 +1617,11 @@ and p_exp' par tail env (e, loc) = string "tmp;", newline, string "uw_error(ctx, FATAL, \"", - string (ErrorMsg.spanToString loc), - string ": %s\", ", + string (if Settings.getDebug () then + ErrorMsg.spanToString loc ^ ": " + else + ""), + string "%s\", ", p_exp' false false env e, string ");", newline, @@ -3515,11 +3518,6 @@ fun p_file env (ds, ps) = NONE => box [] | SOME n => box [string "static void uw_onError(uw_context ctx, char *msg) {", newline, - if Settings.getDebug () then - box [] - else - box [string "uw_cutErrorLocation(msg);", - newline], if !hasJs then box [string "uw_set_script_header(ctx, \"", string allScripts, |