OSX: Fix a compiler warning in new AppleRemote code.

Mark Kendall · Mark Kendall · commit 906fadb910be · 2011-10-25T20:47:35.000+01:00
diff --git a/mythtv/libs/libmythui/AppleRemote.cpp b/mythtv/libs/libmythui/AppleRemote.cpp
@@ -139,11 +139,11 @@ static float GetATVversion()
 
     sysctlbyname("hw.model", &hw_model, &len, NULL, 0);
 
+    float  version = 0.0;
     if ( strstr(hw_model,"AppleTV1,1") )
     {
         FILE  *inpipe;
         char   linebuf[1000];
-        float  version = 0.0;
 
         // Find the build version of the AppleTV OS
         inpipe = popen("sw_vers -buildVersion", "r");
@@ -160,10 +160,9 @@ static float GetATVversion()
                 version = 2.3;
 
             pclose(inpipe);
-
-            return version;
         }
     }
+    return version;
 }
 
 // protected

Original file line number	Diff line number	Diff line change
`@@ -139,11 +139,11 @@ static float GetATVversion()`
`139`	`139`
`140`	`140`	`sysctlbyname("hw.model", &hw_model, &len, NULL, 0);`
`141`	`141`
	`142`	`+ float version = 0.0;`
`142`	`143`	`if ( strstr(hw_model,"AppleTV1,1") )`
`143`	`144`	`{`
`144`	`145`	`FILE *inpipe;`
`145`	`146`	`char linebuf[1000];`
`146`		`- float version = 0.0;`
`147`	`147`
`148`	`148`	`// Find the build version of the AppleTV OS`
`149`	`149`	`inpipe = popen("sw_vers -buildVersion", "r");`
`@@ -160,10 +160,9 @@ static float GetATVversion()`
`160`	`160`	`version = 2.3;`
`161`	`161`
`162`	`162`	`pclose(inpipe);`
`163`		`-`
`164`		`- return version;`
`165`	`163`	`}`
`166`	`164`	`}`
	`165`	`+ return version;`
`167`	`166`	`}`
`168`	`167`
`169`	`168`	`// protected`