From f4f2a493b05b5d3247994769325598655afe7fe0 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 21 Oct 2013 17:12:07 +0200 Subject: work a bit toward string handling unification --- template.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'template.h') diff --git a/template.h b/template.h index 87a1c77b..5caf5e19 100644 --- a/template.h +++ b/template.h @@ -40,7 +40,8 @@ struct template { char *pszName; int iLenName; rsRetVal (*pStrgen)(msg_t*, uchar**, size_t *); - es_str_t *subtree; /* subtree name for subtree-type templates */ + uchar *subtree; /* subtree name for subtree-type templates */ + int subtreeLen; int tpenElements; /* number of elements in templateEntry list */ struct templateEntry *pEntryRoot; struct templateEntry *pEntryLast; @@ -103,7 +104,8 @@ struct templateEntry { int field_expand; /* use multiple instances of the field delimiter as a single one? */ #endif - es_str_t *propName; /**< property name (currently being used for CEE only) */ + uchar *propName; + int propNameLen; enum tplFormatTypes eDateFormat; enum tplFormatCaseConvTypes eCaseConv; -- cgit v1.2.3 From 7d39740b3d88dbd0432806e5f8da32c49cdb69f1 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 22 Oct 2013 17:55:35 +0200 Subject: refactor: use common code for message property description processing in all cases except script var access -- this comes next... --- template.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'template.h') diff --git a/template.h b/template.h index 5caf5e19..1f612eaf 100644 --- a/template.h +++ b/template.h @@ -80,7 +80,7 @@ struct templateEntry { int iLenConstant; /* its length */ } constant; struct { - propid_t propid; /* property to be used */ + msgPropDescr_t msgProp; /* property to be used */ unsigned iFromPos; /* for partial strings only chars from this position ... */ unsigned iToPos; /* up to that one... */ unsigned iFieldNr; /* for field extraction: field to extract */ @@ -104,8 +104,6 @@ struct templateEntry { int field_expand; /* use multiple instances of the field delimiter as a single one? */ #endif - uchar *propName; - int propNameLen; enum tplFormatTypes eDateFormat; enum tplFormatCaseConvTypes eCaseConv; -- cgit v1.2.3 From c0f44743898954aee7f846ce630280a80297b80d Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 23 Oct 2013 15:12:30 +0200 Subject: refactor get.*PropVal() series of functions --- template.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'template.h') diff --git a/template.h b/template.h index 1f612eaf..39fbbe03 100644 --- a/template.h +++ b/template.h @@ -40,8 +40,8 @@ struct template { char *pszName; int iLenName; rsRetVal (*pStrgen)(msg_t*, uchar**, size_t *); - uchar *subtree; /* subtree name for subtree-type templates */ - int subtreeLen; + sbool bHaveSubtree; + msgPropDescr_t subtree; /* subtree property name for subtree-type templates */ int tpenElements; /* number of elements in templateEntry list */ struct templateEntry *pEntryRoot; struct templateEntry *pEntryLast; -- cgit v1.2.3