diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-01 16:30:32 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-01 16:30:32 +0200 |
| commit | 176f773a2e7d29d45e06980e684d293fa3352d72 (patch) | |
| tree | 341540dbc9b77459410f840022dc75f30d668924 /runtime/datetime.h | |
| parent | 8bab264ba168b5fee36a7b45020e5e2172c74224 (diff) | |
| parent | e13537ce909e8e6ab0b9d404c1e4870980c6dacf (diff) | |
| download | rsyslog-176f773a2e7d29d45e06980e684d293fa3352d72.tar.gz rsyslog-176f773a2e7d29d45e06980e684d293fa3352d72.tar.xz rsyslog-176f773a2e7d29d45e06980e684d293fa3352d72.zip | |
Merge branch 'v4-stable' into v4-beta & BUGFIX
Conflicts:
configure.ac
doc/manual.html
runtime/datetime.h
runtime/parser.c
runtime/rsyslog.h
tools/syslogd.c
v4-stable had a bug with RFC5424-formatted structured data, which showed
was detected by the enhanced automatted testbench of v4-beta.
Diffstat (limited to 'runtime/datetime.h')
| -rw-r--r-- | runtime/datetime.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/datetime.h b/runtime/datetime.h index 58f368e7..8140eb71 100644 --- a/runtime/datetime.h +++ b/runtime/datetime.h @@ -34,8 +34,8 @@ typedef struct datetime_s { /* interfaces */ 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); - rsRetVal (*ParseTIMESTAMP3164)(struct syslogTime *pTime, uchar** pszTS); + rsRetVal (*ParseTIMESTAMP3339)(struct syslogTime *pTime, uchar** ppszTS, int*); + rsRetVal (*ParseTIMESTAMP3164)(struct syslogTime *pTime, uchar** pszTS, int*); int (*formatTimestampToMySQL)(struct syslogTime *ts, char* pDst); int (*formatTimestampToPgSQL)(struct syslogTime *ts, char *pDst); int (*formatTimestamp3339)(struct syslogTime *ts, char* pBuf); |