From 0542cf3618b392b10bb51895f44e6cb3414fcbe4 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 20 Jan 2012 13:52:12 +0400
Subject: [PATCH] getservices: change providermap.xml location to
 /var/tuxbox/config

Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/78c855add3912273553f3f35a013f7987dcc5921
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-20 (Fri, 20 Jan 2012)
---
 src/zapit/src/getservices.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp
index 526fd8cef..387ffcdf4 100644
--- a/src/zapit/src/getservices.cpp
+++ b/src/zapit/src/getservices.cpp
@@ -919,7 +919,7 @@ bool CServiceManager::SaveCurrentServices(transponder_id_t tpid)
 	return updated;
 }
 
-#define PROVIDER_MAP_XML CONFIGDIR "/zapit/providermap.xml"
+#define PROVIDER_MAP_XML CONFIGDIR "/providermap.xml"
 bool CServiceManager::LoadProviderMap()
 {
 	xmlDocPtr parser;
@@ -934,12 +934,12 @@ bool CServiceManager::LoadProviderMap()
 			replace.original_network_id = xmlGetNumericAttribute(node, "on", 16);
 			replace.frequency = xmlGetNumericAttribute(node, "frq", 0);
 
-			char * n = xmlGetAttribute(node, "name");
-			char * tn = xmlGetAttribute(node, "newname");
-			if(n)
-				replace.name = n;
-			if(tn)
-				replace.newname = tn;
+			char * name = xmlGetAttribute(node, "name");
+			char * newname = xmlGetAttribute(node, "newname");
+			if(name)
+				replace.name = name;
+			if(newname)
+				replace.newname = newname;
 
 printf("prov map: tsid %04x onid %04x freq %d name [%s] to [%s]\n", replace.transport_stream_id, replace.original_network_id, replace.frequency, replace.name.c_str(), replace.newname.c_str());
 			replace_map.push_back(replace);