Deals with code that cannot execute.

From: Erik Hovland <erik@hovland.org>


---

 mythtv/libs/libmyth/mediamonitor-unix.cpp |    3 ---
 mythtv/libs/libmyth/xmlparse.cpp          |   24 ++++++++++++------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/mythtv/libs/libmyth/mediamonitor-unix.cpp b/mythtv/libs/libmyth/mediamonitor-unix.cpp
index 47b5ad6..051a557 100644
--- a/mythtv/libs/libmyth/mediamonitor-unix.cpp
+++ b/mythtv/libs/libmyth/mediamonitor-unix.cpp
@@ -505,9 +505,6 @@ bool MediaMonitorUnix::AddDevice(const char* devPath)
 
     endfsent();
 
-    if (mep)
-        return AddDevice(mep);
-
     return false;
 }
 
diff --git a/mythtv/libs/libmyth/xmlparse.cpp b/mythtv/libs/libmyth/xmlparse.cpp
index f497a81..0d5632e 100644
--- a/mythtv/libs/libmyth/xmlparse.cpp
+++ b/mythtv/libs/libmyth/xmlparse.cpp
@@ -991,35 +991,35 @@ void XMLParse::parseImageGrid(LayerSet *container, QDomElement &element)
             }
         }
     }
-    fontProp *font1 = GetFont(activeFont);
-    if (!font1)
+    fontProp *activeFontProp = GetFont(activeFont);
+    if (!activeFontProp)
     {
-        cerr << "Unknown font: " << (const char *)activeFont
+        cerr << "[active font] Unknown font: " << (const char *)activeFont
              << " in image grid: " << (const char *)name << endl;
         return;
     }
 
-    fontProp *font2 = GetFont(selectedFont);
-    if (!font2)
+    fontProp *selectedFontProp = GetFont(selectedFont);
+    if (!selectedFontProp)
     {
-        cerr << "Unknown font: " << (const char *)selectedFont
+        cerr << "[selected font] Unknown font: " << (const char *)selectedFont
              << " in image grid: " << (const char *)name << endl;
         return;
     }
 
-    fontProp *font3 = GetFont(inactiveFont);
-    if (!font2)
+    fontProp *inactiveFontProp = GetFont(inactiveFont);
+    if (!inactiveFontProp)
     {
-        cerr << "Unknown font: " << (const char *)inactiveFont
+        cerr << "inactive font] Unknown font: " << (const char *)inactiveFont
              << " in image grid: " << (const char *)name << endl;
         return;
     }
 
     UIImageGridType *grid = new UIImageGridType(name, order.toInt());
     grid->SetScreen(wmult, hmult);
-    grid->setActiveFont(font1);
-    grid->setSelectedFont(font2);
-    grid->setInactiveFont(font3);
+    grid->setActiveFont(activeFontProp);
+    grid->setSelectedFont(selectedFontProp);
+    grid->setInactiveFont(inactiveFontProp);
     grid->setCutDown(cutdown);
     grid->setShowChecks(showChecks);
     grid->setShowSelected(showSelected);