diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-25 16:21:01 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-25 16:21:01 +0200 |
commit | c7b309a662a4310a8b878c036d9440e0b2e345a8 (patch) | |
tree | 17868591721a1cde29e5e9cfaadd92883478ad4a /runtime/datetime.c | |
parent | 4818b0081d3a265a87f9f646d79f2a2ffbcda819 (diff) | |
parent | 1f79c785975261e4158c9b85f6451d5bd00b2495 (diff) | |
download | rsyslog-c7b309a662a4310a8b878c036d9440e0b2e345a8.tar.gz rsyslog-c7b309a662a4310a8b878c036d9440e0b2e345a8.tar.bz2 rsyslog-c7b309a662a4310a8b878c036d9440e0b2e345a8.zip |
Merge branch 'master' into v5-devel
Conflicts:
runtime/queue.c
Diffstat (limited to 'runtime/datetime.c')
-rw-r--r-- | runtime/datetime.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/datetime.c b/runtime/datetime.c index 069cf55c..5b9f5b6d 100644 --- a/runtime/datetime.c +++ b/runtime/datetime.c @@ -548,7 +548,7 @@ finalize_it: * returns the size of the timestamp written in bytes (without * the string terminator). If 0 is returend, an error occured. */ -int formatTimestampToMySQL(struct syslogTime *ts, char* pBuf, size_t iLenDst) +int formatTimestampToMySQL(struct syslogTime *ts, char* pBuf) { /* currently we do not consider localtime/utc. This may later be * added. If so, I recommend using a property replacer option @@ -579,7 +579,7 @@ int formatTimestampToMySQL(struct syslogTime *ts, char* pBuf, size_t iLenDst) } -int formatTimestampToPgSQL(struct syslogTime *ts, char *pBuf, size_t iLenDst) +int formatTimestampToPgSQL(struct syslogTime *ts, char *pBuf) { /* see note in formatTimestampToMySQL, applies here as well */ assert(ts != NULL); @@ -657,7 +657,7 @@ int formatTimestampSecFrac(struct syslogTime *ts, char* pBuf) * returns the size of the timestamp written in bytes (without * the string terminator). If 0 is returend, an error occured. */ -int formatTimestamp3339(struct syslogTime *ts, char* pBuf, size_t iLenBuf) +int formatTimestamp3339(struct syslogTime *ts, char* pBuf) { int iBuf; int power; @@ -734,7 +734,7 @@ int formatTimestamp3339(struct syslogTime *ts, char* pBuf, size_t iLenBuf) * returns the size of the timestamp written in bytes (without * the string termnator). If 0 is returend, an error occured. */ -int formatTimestamp3164(struct syslogTime *ts, char* pBuf, size_t iLenBuf) +int formatTimestamp3164(struct syslogTime *ts, char* pBuf) { static char* monthNames[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; |