Changeset ce6721f
- Timestamp:
- Dec 6, 2008, 2:33:28 AM (16 years ago)
- Branches:
- master, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9
- Children:
- 19bab8e
- Parents:
- 3645317
- git-author:
- Anders Kaseorg <andersk@mit.edu> (12/06/08 00:44:46)
- git-committer:
- Anders Kaseorg <andersk@mit.edu> (12/06/08 02:33:28)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
perlconfig.c
rc4ba74d rce6721f 199 199 200 200 if (SvTRUE(ERRSV)) { 201 STRLEN n_a; 202 owl_function_error("Perl Error: '%s'", SvPV(ERRSV, n_a)); 201 owl_function_error("Perl Error: '%s'", SvPV_nolen(ERRSV)); 203 202 /* and clear the error */ 204 203 sv_setsv (ERRSV, &PL_sv_undef); … … 261 260 262 261 if (SvTRUE(ERRSV)) { 263 STRLEN n_a; 264 owl_function_error("Error: '%s'", SvPV(ERRSV, n_a)); 262 owl_function_error("Error: '%s'", SvPV_nolen(ERRSV)); 265 263 /* and clear the error */ 266 264 sv_setsv (ERRSV, &PL_sv_undef); … … 303 301 ret=perl_parse(p, owl_perl_xs_init, 2, args, NULL); 304 302 if (ret || SvTRUE(ERRSV)) { 305 STRLEN n_a; 306 err=owl_strdup(SvPV(ERRSV, n_a)); 303 err=owl_strdup(SvPV_nolen(ERRSV)); 307 304 sv_setsv(ERRSV, &PL_sv_undef); /* and clear the error */ 308 305 return(err); … … 311 308 ret=perl_run(p); 312 309 if (ret || SvTRUE(ERRSV)) { 313 STRLEN n_a; 314 err=owl_strdup(SvPV(ERRSV, n_a)); 310 err=owl_strdup(SvPV_nolen(ERRSV)); 315 311 sv_setsv(ERRSV, &PL_sv_undef); /* and clear the error */ 316 312 return(err); … … 341 337 342 338 if (SvTRUE(ERRSV)) { 343 STRLEN n_a; 344 err=owl_strdup(SvPV(ERRSV, n_a)); 339 err=owl_strdup(SvPV_nolen(ERRSV)); 345 340 sv_setsv (ERRSV, &PL_sv_undef); /* and clear the error */ 346 341 return(err); … … 395 390 396 391 if (SvTRUE(ERRSV)) { 397 STRLEN n_a; 398 owl_function_error("Perl Error: '%s'", SvPV(ERRSV, n_a)); 392 owl_function_error("Perl Error: '%s'", SvPV_nolen(ERRSV)); 399 393 sv_setsv (ERRSV, &PL_sv_undef); /* and clear the error */ 400 394 } … … 438 432 char * ret = NULL; 439 433 SV *rv; 440 STRLEN n_a;441 434 dSP; 442 435 … … 457 450 458 451 if(SvTRUE(ERRSV)) { 459 owl_function_error("%s", SvPV (ERRSV, n_a));452 owl_function_error("%s", SvPV_nolen(ERRSV)); 460 453 (void)POPs; 461 454 } else { … … 464 457 rv = POPs; 465 458 if(SvTRUE(rv)) { 466 ret = owl_strdup(SvPV (rv, n_a));459 ret = owl_strdup(SvPV_nolen(rv)); 467 460 } 468 461 } … … 488 481 SV *cb = (SV*)(e->cbdata); 489 482 SV *text; 490 unsigned int n_a;491 483 dSP; 492 484 … … 507 499 508 500 if(SvTRUE(ERRSV)) { 509 owl_function_error("%s", SvPV (ERRSV, n_a));501 owl_function_error("%s", SvPV_nolen(ERRSV)); 510 502 } 511 503 … … 525 517 call_pv("BarnOwl::Hooks::_mainloop_hook", G_DISCARD|G_EVAL); 526 518 if(SvTRUE(ERRSV)) { 527 STRLEN n_a; 528 owl_function_error("%s", SvPV(ERRSV, n_a)); 519 owl_function_error("%s", SvPV_nolen(ERRSV)); 529 520 } 530 521 return; … … 534 525 { 535 526 SV *cb = d->pfunc; 536 unsigned int n_a;537 527 dSP; 538 528 if(cb == NULL) { … … 549 539 550 540 if(SvTRUE(ERRSV)) { 551 owl_function_error("%s", SvPV (ERRSV, n_a));541 owl_function_error("%s", SvPV_nolen(ERRSV)); 552 542 } 553 543
Note: See TracChangeset
for help on using the changeset viewer.