summaryrefslogtreecommitdiff
path: root/runtime/msg.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2013-09-03 22:42:46 +0200
committerMichael Biebl <biebl@debian.org>2013-09-03 22:42:46 +0200
commit0c656246c6818b9fd0426411ed1cf926fbbc907d (patch)
treeca5db297c70a912d88b42df3c56a53c304aef5a3 /runtime/msg.c
parenta400789c367fd3cd8d0f9588ca2af72dcac47c9c (diff)
downloadrsyslog-0c656246c6818b9fd0426411ed1cf926fbbc907d.tar.gz
Imported Upstream version 7.4.4upstream/7.4.4
Diffstat (limited to 'runtime/msg.c')
-rw-r--r--runtime/msg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/msg.c b/runtime/msg.c
index a227567..36cbd26 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -41,7 +41,7 @@
#endif
#include <netdb.h>
#include <libestr.h>
-#include <json/json.h>
+#include <json.h>
/* For struct json_object_iter, should not be necessary in future versions */
#include <json/json_object_private.h>
#if HAVE_MALLOC_H
@@ -2495,10 +2495,10 @@ static uchar *getNOW(eNOWType eNow, struct syslogTime *t)
memcpy(pBuf, two_digits[(int)t->hour], 3);
break;
case NOW_HHOUR:
- memcpy(pBuf, two_digits[t->hour/30], 3);
+ memcpy(pBuf, two_digits[t->minute/30], 3);
break;
case NOW_QHOUR:
- memcpy(pBuf, two_digits[t->hour/15], 3);
+ memcpy(pBuf, two_digits[t->minute/15], 3);
break;
case NOW_MINUTE:
memcpy(pBuf, two_digits[(int)t->minute], 3);