From db2b679ef6aa0ac3d4679ad3e00a72993204ea78 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 29 Mar 2008 12:14:33 +0100 Subject: Imported Upstream version 1.19.7 --- template.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'template.h') diff --git a/template.h b/template.h index 3bed9c8..e099e58 100644 --- a/template.h +++ b/template.h @@ -45,11 +45,11 @@ struct templateEntry { enum EntryTypes eEntryType; union { struct { - char *pConstant; /* pointer to constant value */ + uchar *pConstant; /* pointer to constant value */ int iLenConstant; /* its length */ } constant; struct { - char *pPropRepl; /* pointer to property replacer string */ + uchar *pPropRepl; /* pointer to property replacer string */ unsigned iFromPos; /* for partial strings only chars from this position ... */ unsigned iToPos; /* up to that one... */ #ifdef FEATURE_REGEXP @@ -85,8 +85,8 @@ void tplLastStaticInit(struct template *tpl); * BEFORE msg.h, even if your code file does not actually need it. * rgerhards, 2007-08-06 */ -uchar *tplToString(struct template *pTpl, msg_t *pMsg); -void doSQLEscape(char **pp, size_t *pLen, unsigned short *pbMustBeFreed, int escapeMode); +rsRetVal tplToString(struct template *pTpl, msg_t *pMsg, uchar** ppSz); +void doSQLEscape(uchar **pp, size_t *pLen, unsigned short *pbMustBeFreed, int escapeMode); #endif /* #ifndef TEMPLATE_H_INCLUDED */ /* -- cgit v1.2.3