summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-10-02 15:52:47 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-10-02 15:52:47 +0200
commit39000a62024510cd62607200e6100e3cd7c05005 (patch)
tree9e92eb2f7d3d6d3921338cd4ce5196b963b27cb1
parent02bb3c901d9b14e8a08b111dde151f1ed4d2d1da (diff)
parent1ec858244efc4265fa5fa4c797c006a82ca52308 (diff)
downloadrsyslog-39000a62024510cd62607200e6100e3cd7c05005.tar.gz
rsyslog-39000a62024510cd62607200e6100e3cd7c05005.tar.xz
rsyslog-39000a62024510cd62607200e6100e3cd7c05005.zip
Merge branch 'beta'
-rw-r--r--ChangeLog4
-rw-r--r--runtime/datetime.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1fe5b13b..7e9580d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,6 +111,10 @@ Version 3.21.0 [DEVEL] (rgerhards), 2008-07-18
see below)
---------------------------------------------------------------------------
Version 3.19.12 [BETA] (rgerhards), 2008-08-25
+- bugfix: subseconds where not correctly extracted from a timestamp
+ if that timestamp did not contain any subsecond information (the
+ resulting string was garbagge but should have been "0", what it
+ now is).
---------------------------------------------------------------------------
Version 3.19.11 [BETA] (rgerhards), 2008-08-25
This is a refresh of the beta. No beta-specific fixes have been added.
diff --git a/runtime/datetime.c b/runtime/datetime.c
index 47cde8c2..20ca6191 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -582,7 +582,7 @@ int formatTimestampSecFrac(struct syslogTime *ts, char* pBuf, size_t iLenBuf)
lenRet = snprintf(pBuf, iLenBuf, szFmtStr, ts->secfrac);
} else {
pBuf[0] = '0';
- pBuf[1] = '1';
+ pBuf[1] = '\0';
lenRet = 1;
}