3392e41b22
- Merge fixes from lp:timezonemap - Add cc-timezone-location.h to timezonemapincludes_HEADERS so it gets installed (iain.lane) - Set en_name correctly (iain.lane) - Don't call g_type_init() on glib >= 2.35; it's deprecated (iain.lane)
26 lines
606 B
Diff
26 lines
606 B
Diff
From e2d3309d6ae6adb7f7041766e29333ea2cbc2a31 Mon Sep 17 00:00:00 2001
|
|
From: Iain Lane <iain.lane@canonical.com>
|
|
Date: Fri, 29 Nov 2013 10:22:22 +0000
|
|
Subject: [PATCH 12/18] Merge r36 from lp:~dshea/timezonemap/trunk
|
|
|
|
Don't try to close a NULL file pointer.
|
|
---
|
|
src/tz.c | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/src/tz.c b/src/tz.c
|
|
index c294b44..50ce7a3 100644
|
|
--- a/src/tz.c
|
|
+++ b/src/tz.c
|
|
@@ -305,7 +305,6 @@ void parse_file (const char * filename,
|
|
if (!fh)
|
|
{
|
|
g_warning ("Could not open *%s*\n", filename);
|
|
- fclose (fh);
|
|
return;
|
|
}
|
|
|
|
--
|
|
1.8.4.2
|
|
|