sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

r7066: Rename http_exception to ejs_exception.

Browse Source 
(This used to be commit f2e59d3adfd7813c3c2090350f8ff2a99a5533e9)
This commit is contained in:
Tim Potter 2005-05-29 04:10:22 +00:00 committed by Gerald (Jerry) Carter
parent 14ade23914
commit 7756b990f3
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/lib/ejs/miniMpr.c
View File

@ -163,7 +163,7 @@ void mprBreakpoint(const char *file, int line, const char *cond)
char *buf;
mprAllocSprintf(&buf, MPR_MAX_STRING, "esp exception - ASSERT at %s:%d, %s\n",
file, line, cond);
http_exception(buf);
ejs_exception(buf);
}
#endif /* !BLD_GOAHEAD_WEBSERVER */

4
source4/scripting/ejs/smbscript.c
View File

@ -23,7 +23,7 @@
#include "includes.h"
#include "lib/ejs/ejs.h"
void http_exception(const char *reason)
void ejs_exception(const char *reason)
{
fprintf(stderr, "smbscript exception: %s", reason);
exit(1);
@ -61,7 +61,7 @@ static int writeProc(MprVarHandle userHandle, int argc, char **argv)
exit(1);
}
if (ejsEvalScript(eid, "write(\"hello\n\");", &result, &emsg) == -1) {
if (ejsEvalFile(eid, (char *)argv[1], &result, &emsg) == -1) {
fprintf(stderr, "smbscript: ejsEvalScript(): %s\n", emsg);
exit(1);
}

10
source4/web_server/http.c
View File

@ -461,17 +461,17 @@ static void http_setup_arrays(struct esp_state *esp)
report a internal server error via http
*/
#include <setjmp.h>
static jmp_buf http_exception_buf;
static jmp_buf ejs_exception_buf;
static const char *exception_reason;
void http_exception(const char *reason)
void ejs_exception(const char *reason)
{
exception_reason = reason;
DEBUG(0,("%s", reason));
longjmp(http_exception_buf, -1);
longjmp(ejs_exception_buf, -1);
}
#else
void http_exception(const char *reason)
void ejs_exception(const char *reason)
{
DEBUG(0,("%s", reason));
smb_panic(reason);
@ -497,7 +497,7 @@ static void esp_request(struct esp_state *esp)
}
#if HAVE_SETJMP_H
if (setjmp(http_exception_buf) != 0) {
if (setjmp(ejs_exception_buf) != 0) {
http_error(web, 500, exception_reason);
return;
}