summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-03-26 08:18:17 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-03-26 08:18:17 +0000
commit562906e64aa11fbf0e2b104b55b2a98233df9ae5 (patch)
treea64ae26f0d6010cc8a6dd91fda69959ba9c6162d
parentd6258e5c91f3fb73483b385f9e3b6d239ca21095 (diff)
downloadrsyslog-562906e64aa11fbf0e2b104b55b2a98233df9ae5.tar.gz
rsyslog-562906e64aa11fbf0e2b104b55b2a98233df9ae5.tar.xz
rsyslog-562906e64aa11fbf0e2b104b55b2a98233df9ae5.zip
bugfix: QHOUR and HHOUR properties were wrongly calculated
-rw-r--r--ChangeLog3
-rw-r--r--msg.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f3f45f8b..e0602860 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
---------------------------------------------------------------------------
-Version 3.13.0 (rgerhards), 2008-03-??
+Version 3.12.5 (rgerhards), 2008-03-??
+- bugfix: QHOUR and HHOUR properties were wrongly calculated
---------------------------------------------------------------------------
Version 3.12.4 (rgerhards), 2008-03-25
- Greatly enhanced rsyslogd's file write performance by disabling
diff --git a/msg.c b/msg.c
index d2713871..0875cd50 100644
--- a/msg.c
+++ b/msg.c
@@ -1509,10 +1509,10 @@ static uchar *getNOW(eNOWType eNow)
snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t.hour);
break;
case NOW_HHOUR:
- snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t.hour / 30);
+ snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t.minute / 30);
break;
case NOW_QHOUR:
- snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t.hour / 15);
+ snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t.minute / 15);
break;
case NOW_MINUTE:
snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t.minute);