diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-12 15:11:38 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-12 15:11:38 +0200 |
commit | 63994d092c3567030b96d28dbdc3db5f0e22fba2 (patch) | |
tree | 42d94ec95dc0231b0a8a86c52fd9605e524e6b09 /runtime/datetime.h | |
parent | 2082d963975a88c8e4dee3a43b98d939f9a2323f (diff) | |
parent | c04f196e25d63a7f45bf2ad79b48019fed98e5c9 (diff) | |
download | rsyslog-63994d092c3567030b96d28dbdc3db5f0e22fba2.tar.gz rsyslog-63994d092c3567030b96d28dbdc3db5f0e22fba2.tar.xz rsyslog-63994d092c3567030b96d28dbdc3db5f0e22fba2.zip |
Merge branch 'v3-stable' into beta
Conflicts:
runtime/datetime.h
runtime/rsyslog.h
Diffstat (limited to 'runtime/datetime.h')
-rw-r--r-- | runtime/datetime.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/runtime/datetime.h b/runtime/datetime.h index 8f1bcb17..755cc0ed 100644 --- a/runtime/datetime.h +++ b/runtime/datetime.h @@ -37,7 +37,7 @@ typedef struct datetime_s { BEGINinterface(datetime) /* name must also be changed in ENDinterface macro! */ void (*getCurrTime)(struct syslogTime *t); int (*ParseTIMESTAMP3339)(struct syslogTime *pTime, char** ppszTS); - int (*ParseTIMESTAMP3164)(struct syslogTime *pTime, char* pszTS); + int (*ParseTIMESTAMP3164)(struct syslogTime *pTime, char** pszTS); int (*formatTimestampToMySQL)(struct syslogTime *ts, char* pDst, size_t iLenDst); int (*formatTimestampToPgSQL)(struct syslogTime *ts, char *pDst, size_t iLenDst); int (*formatTimestamp3339)(struct syslogTime *ts, char* pBuf, size_t iLenBuf); @@ -45,6 +45,12 @@ BEGINinterface(datetime) /* name must also be changed in ENDinterface macro! */ int (*formatTimestampSecFrac)(struct syslogTime *ts, char* pBuf, size_t iLenBuf); ENDinterface(datetime) #define datetimeCURR_IF_VERSION 2 /* increment whenever you change the interface structure! */ +/* interface changes: + * 1 - initial version + * 2 - not compatible to 1 - bugfix required ParseTIMESTAMP3164 to accept char ** as + * last parameter. Did not try to remain compatible as this is not something any + * third-party module should call. -- rgerhards, 2008.-09-12 + */ /* prototypes */ PROTOTYPEObj(datetime); |