X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fperl.c;h=58643f0fa24707009068a5e361b4d4f94ddb33be;hb=fde873f3a2871df467e5783eaa685295015c0089;hp=5f4f0d98dcad7699173bad27b5762d381047de77;hpb=d5b80e59458182b2d557a929a18cb8c70cd56b68;p=exim.git diff --git a/src/src/perl.c b/src/src/perl.c index 5f4f0d98d..58643f0fa 100644 --- a/src/src/perl.c +++ b/src/src/perl.c @@ -3,6 +3,7 @@ *************************************************/ /* Copyright (c) 1998 Malcolm Beattie */ +/* Copyright (C) 1999 - 2018 Exim maintainers */ /* Modified by PH to get rid of the "na" usage, March 1999. Modified further by PH for general tidying for Exim 4. @@ -61,7 +62,7 @@ XS(xs_expand_string) ST(0) = sv_newmortal(); if (str != NULL) sv_setpv(ST(0), CCS str); - else if (!expand_string_forcedfail) + else if (!f.expand_string_forcedfail) croak("syntax error in Exim::expand_string argument: %s", expand_string_message); } @@ -150,9 +151,8 @@ cleanup_perl(void) interp_perl = 0; } -uschar * -call_perl_cat(uschar *yield, int *sizep, int *ptrp, uschar **errstrp, - uschar *name, uschar **arg) +gstring * +call_perl_cat(gstring * yield, uschar **errstrp, uschar *name, uschar **arg) { dSP; SV *sv; @@ -186,7 +186,7 @@ call_perl_cat(uschar *yield, int *sizep, int *ptrp, uschar **errstrp, return NULL; } str = US SvPV(sv, len); - yield = string_catn(yield, sizep, ptrp, str, (int)len); + yield = string_catn(yield, str, (int)len); FREETMPS; LEAVE;