diff options
| author | Michael Biebl <biebl@debian.org> | 2014-08-18 17:48:21 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2014-08-18 17:48:21 +0200 |
| commit | edb958301d8c162cb21278d01d802026a1e1afe7 (patch) | |
| tree | c0a155296fcfb56c4d2a14adadbe2443eb6947c3 /runtime/datetime.h | |
| parent | b8bc384c9ff7e258d2d26511302f6feb3e4f5e00 (diff) | |
| parent | 1dfcd909d90f6fad4a612b6fd998d7473a9da399 (diff) | |
| download | rsyslog-edb958301d8c162cb21278d01d802026a1e1afe7.tar.gz | |
Merge tag 'upstream/8.4.0'
Upstream version 8.4.0
Diffstat (limited to 'runtime/datetime.h')
| -rw-r--r-- | runtime/datetime.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/runtime/datetime.h b/runtime/datetime.h index 72c3a97..c96f7ee 100644 --- a/runtime/datetime.h +++ b/runtime/datetime.h @@ -34,7 +34,7 @@ typedef struct datetime_s { BEGINinterface(datetime) /* name must also be changed in ENDinterface macro! */ void (*getCurrTime)(struct syslogTime *t, time_t *ttSeconds); rsRetVal (*ParseTIMESTAMP3339)(struct syslogTime *pTime, uchar** ppszTS, int*); - rsRetVal (*ParseTIMESTAMP3164)(struct syslogTime *pTime, uchar** pszTS, int*); + rsRetVal (*ParseTIMESTAMP3164)(struct syslogTime *pTime, uchar** pszTS, int*, const int bParseTZ); int (*formatTimestampToMySQL)(struct syslogTime *ts, char* pDst); int (*formatTimestampToPgSQL)(struct syslogTime *ts, char *pDst); int (*formatTimestamp3339)(struct syslogTime *ts, char* pBuf); @@ -48,7 +48,7 @@ BEGINinterface(datetime) /* name must also be changed in ENDinterface macro! */ int (*formatTimestampUnix)(struct syslogTime *ts, char*pBuf); time_t (*syslogTime2time_t)(struct syslogTime *ts); ENDinterface(datetime) -#define datetimeCURR_IF_VERSION 7 /* increment whenever you change the interface structure! */ +#define datetimeCURR_IF_VERSION 8 /* increment whenever you change the interface structure! */ /* interface changes: * 1 - initial version * 2 - not compatible to 1 - bugfix required ParseTIMESTAMP3164 to accept char ** as @@ -58,10 +58,15 @@ ENDinterface(datetime) * 4 - formatTimestamp3164 takes a third int parameter * 5 - merge of versions 3 + 4 (2010-03-09) * 6 - see above + * 8 - ParseTIMESTAMP3164 has addtl parameter to permit TZ string parsing */ +#define PARSE3164_TZSTRING 1 +#define NO_PARSE3164_TZSTRING 0 + /* prototypes */ PROTOTYPEObj(datetime); void applyDfltTZ(struct syslogTime *pTime, char *tz); +int getWeekdayNbr(struct syslogTime *ts); #endif /* #ifndef INCLUDED_DATETIME_H */ |