File 0002-zoneinfo-fix-typos.patch of Package syslog-ng.12645
From f44ed7985b0fb7ab2568217c44471b62078fa318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= <laszlo.varady@balabit.com>
Date: Sat, 31 Aug 2019 00:31:26 +0200
Subject: [PATCH 2/4] zoneinfo: fix typos
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: László Várady <laszlo.varady@balabit.com>
(cherry picked from commit f6bbac715379c6380999970597eef46dfe0f488d)
---
lib/timeutils.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/timeutils.c b/lib/timeutils.c
index 35b11686f..42d0d0c6e 100644
--- a/lib/timeutils.c
+++ b/lib/timeutils.c
@@ -462,7 +462,7 @@ readcoded32(unsigned char **input, gint64 minv, gint64 maxv)
if (val < minv || val > maxv)
{
msg_error("Error while processing the time zone file",
- evt_tag_str("message", "oded value out-of-range"),
+ evt_tag_str("message", "Coded value out-of-range"),
evt_tag_int("value", val),
evt_tag_printf("expected", "[%"G_GINT64_FORMAT", %"G_GINT64_FORMAT"]", minv, maxv));
g_assert_not_reached();
@@ -560,7 +560,7 @@ zone_info_parser(unsigned char **input, gboolean is64bitData, gint *version)
gint64 *transition_times = NULL;
guint8 *transition_types = NULL;
gint32 *gmt_offsets = NULL;
- gint64 isgmtcnt, isdstcnt, leapcnt, timecnt, typecnt, charcnt;
+ gint64 isgmtcnt, isstdcnt, leapcnt, timecnt, typecnt, charcnt;
gboolean insertInitial = FALSE;
buf = *input;
@@ -600,7 +600,7 @@ zone_info_parser(unsigned char **input, gboolean is64bitData, gint *version)
/* Read array sizes */
isgmtcnt = readcoded32(input, 0, G_MAXINT64);
- isdstcnt = readcoded32(input, 0, G_MAXINT64);
+ isstdcnt = readcoded32(input, 0, G_MAXINT64);
leapcnt = readcoded32(input, 0, G_MAXINT64);
timecnt = readcoded32(input, 0, G_MAXINT64);
typecnt = readcoded32(input, 0, G_MAXINT64);
@@ -613,10 +613,10 @@ zone_info_parser(unsigned char **input, gboolean is64bitData, gint *version)
*/
if (isgmtcnt != typecnt ||
- isdstcnt != typecnt)
+ isstdcnt != typecnt)
{
msg_warning("Error in the time zone file",
- evt_tag_str("message", "Count mismatch between tzh_ttisgmtcnt, tzh_ttisdstcnt, tth_typecnt"));
+ evt_tag_str("message", "Count mismatch between tzh_ttisgmtcnt, tzh_ttisstdcnt, tzh_typecnt"));
}
/*
--
2.16.4