git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hints DB interface: convert from macros to inlinable functions.
[exim.git]
/
src
/
src
/
perl.c
diff --git
a/src/src/perl.c
b/src/src/perl.c
index 92218a6efb1e5d33ba9c5289dc53a9b7e9337a03..c6d329102d87ff9c51c9f4cd55eaf9e675339e17 100644
(file)
--- a/
src/src/perl.c
+++ b/
src/src/perl.c
@@
-3,6
+3,7
@@
*************************************************/
/* Copyright (c) 1998 Malcolm Beattie */
*************************************************/
/* 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.
/* Modified by PH to get rid of the "na" usage, March 1999.
Modified further by PH for general tidying for Exim 4.
@@
-14,6
+15,10
@@
/* See the file NOTICE for conditions of use and distribution. */
#include <assert.h>
/* See the file NOTICE for conditions of use and distribution. */
#include <assert.h>
+
+#define HINTSDB_H
+#define DBFUNCTIONS_H
+
#include "exim.h"
#define EXIM_TRUE TRUE
#include "exim.h"
#define EXIM_TRUE TRUE
@@
-60,8
+65,8
@@
XS(xs_expand_string)
str = expand_string(US SvPV(ST(0), len));
ST(0) = sv_newmortal();
if (str != NULL)
str = expand_string(US SvPV(ST(0), len));
ST(0) = sv_newmortal();
if (str != NULL)
- sv_setpv(ST(0),
(const char *)
str);
- else if (!expand_string_forcedfail)
+ sv_setpv(ST(0),
CCS
str);
+ else if (!
f.
expand_string_forcedfail)
croak("syntax error in Exim::expand_string argument: %s",
expand_string_message);
}
croak("syntax error in Exim::expand_string argument: %s",
expand_string_message);
}
@@
-150,9
+155,8
@@
cleanup_perl(void)
interp_perl = 0;
}
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;
{
dSP;
SV *sv;
@@
-186,7
+190,7
@@
call_perl_cat(uschar *yield, int *sizep, int *ptrp, uschar **errstrp,
return NULL;
}
str = US SvPV(sv, len);
return NULL;
}
str = US SvPV(sv, len);
- yield = string_catn(yield, s
izep, ptrp, s
tr, (int)len);
+ yield = string_catn(yield, str, (int)len);
FREETMPS;
LEAVE;
FREETMPS;
LEAVE;