[310] in BarnOwl Developers
[D-O-H] r454 - / trunk/owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:04:46 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Fri, 10 Nov 2006 12:38:50 -0500 (EST)
Author: nelhage
Date: 2006-11-10 12:38:50 -0500 (Fri, 10 Nov 2006)
New Revision: 454
Modified:
/
trunk/owl/perlconfig.c
Log:
r23945@heretique: nelhage | 2006-11-10 12:36:38 -0500
Handling errors in the perl mainloop hook better
Property changes on:
___________________________________________________________________
Name: svk:merge
- 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:23943
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
+ 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:23945
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
Modified: trunk/owl/perlconfig.c
===================================================================
--- trunk/owl/perlconfig.c 2006-11-10 04:40:50 UTC (rev 453)
+++ trunk/owl/perlconfig.c 2006-11-10 17:38:50 UTC (rev 454)
@@ -334,7 +334,7 @@
SPAGAIN;
if(SvTRUE(ERRSV)) {
- owl_function_error("Error: %s", SvPV(ERRSV, n_a));
+ owl_function_error("%s", SvPV(ERRSV, n_a));
POPs;
} else {
if(count != 1)
@@ -385,6 +385,10 @@
{
dSP ;
PUSHMARK(SP) ;
- call_pv("owl::mainloop_hook", G_DISCARD|G_EVAL|G_KEEPERR);
+ call_pv("owl::mainloop_hook", G_DISCARD|G_EVAL);
+ if(SvTRUE(ERRSV)) {
+ STRLEN n_a;
+ owl_function_error("%s", SvPV(ERRSV, n_a));
+ }
return;
}
