From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Wed, 2 Dec 2020 14:04:08 +0000 (+0100)
Subject: location-functions.pl: Remove accidently keept 2nd DB init call.
X-Git-Tag: v2.25-core155~384^2~1^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa9dd5386cfac0ea069c4f6d51628e3d7ea56458;p=ipfire-2.x.git

location-functions.pl: Remove accidently keept 2nd DB init call.

The get_full_country_name() function had an accidenlty and not longer
required call of the DB init function.

This is a waste of memory and a known problem, especially on systems
with less than 1GB of RAM, where the application which uses libloc in
such a redundant way crashes.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/cfgroot/location-functions.pl b/config/cfgroot/location-functions.pl
index b7465c5ef0..fb97eb5892 100644
--- a/config/cfgroot/location-functions.pl
+++ b/config/cfgroot/location-functions.pl
@@ -163,9 +163,6 @@ sub get_full_country_name($) {
 		# Grab location name from hash.
 		$name = $not_iso_3166_location{$code};
 	} else {
-		# Init libloc database connection.
-		my $db_handle = &init();
-
 		# Get the country name by using the location module.
 		$name = &Location::get_country_name($db_handle, $code);
 	}