[[ Bug 14422 ]] Cleanup a few stylistic things.

runrevmark · runrevmark · commit 2aba7fbd896f · 2015-02-04T13:09:53.000Z
diff --git a/engine/src/deploy.cpp b/engine/src/deploy.cpp
@@ -120,6 +120,9 @@ static bool MCDeployMapArchitectureString(const MCString& p_string, MCDeployArch
 
 static Exec_stat MCDeployPushMinOSVersion(MCDeployParameters& p_params, MCDeployArchitecture p_arch, const char *p_vers_string)
 {
+    // Use sscanf to parse out the version string. We don't check the return value of
+    // sscanf as we don't care - any malformed / missing components will come out as
+    // 0.
     int t_major, t_minor, t_inc;
     t_major = t_minor = t_inc = 0;
     sscanf(p_vers_string, "%d.%d.%d", &t_major, &t_minor, &t_inc);
diff --git a/engine/src/deploy.h b/engine/src/deploy.h
@@ -56,7 +56,7 @@ struct MCDeployParameters
     // When building for Mac/iOS, you can specify a min os version per arch
     // slice.
     MCDeployMinOSVersion *min_os_versions;
-    uint32_t min_os_version_count;
+    uindex_t min_os_version_count;
     
 	// The root stackfile to be included in the standalone.
 	char *stackfile;
diff --git a/engine/src/deploy_macosx.cpp b/engine/src/deploy_macosx.cpp
@@ -1155,6 +1155,8 @@ static bool MCDeployToMacOSXFetchMinOSVersion(const MCDeployParameters& p_params
         t_arch = kMCDeployArchitecture_PPC;
     else if (p_header . cputype == CPU_TYPE_POWERPC64)
         t_arch = kMCDeployArchitecture_PPC64;
+    else
+        t_arch = kMCDeployArchitecture_Unknown;
     
     // Search for both the architecture in the mach header and for the 'unknown'
     // architecture. If the real arch is found, then we use that version; otherwise
@@ -1165,16 +1167,16 @@ static bool MCDeployToMacOSXFetchMinOSVersion(const MCDeployParameters& p_params
     t_found_index = -1;
     for(uindex_t i = 0; i < p_params . min_os_version_count; i++)
         if (p_params . min_os_versions[i] . architecture == t_arch &&
-            t_found_index == -1)
+            t_found_index < 0)
             t_found_index = (signed)i;
         else if (p_params . min_os_versions[i] . architecture == kMCDeployArchitecture_Unknown &&
-                 t_unknown_index == -1)
+                 t_unknown_index < 0)
             t_unknown_index = -1;
     
-    if (t_found_index == -1 && t_unknown_index == -1)
+    if (t_found_index < 0 && t_unknown_index < 0)
         return false;
     
-    if (t_found_index == -1)
+    if (t_found_index >= 0)
     {
         r_version = p_params . min_os_versions[t_unknown_index] . version;
         return true;

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,9 @@ static bool MCDeployMapArchitectureString(const MCString& p_string, MCDeployArch`
`120`	`120`
`121`	`121`	`static Exec_stat MCDeployPushMinOSVersion(MCDeployParameters& p_params, MCDeployArchitecture p_arch, const char *p_vers_string)`
`122`	`122`	`{`
	`123`	`+ // Use sscanf to parse out the version string. We don't check the return value of`
	`124`	`+ // sscanf as we don't care - any malformed / missing components will come out as`
	`125`	`+ // 0.`
`123`	`126`	`int t_major, t_minor, t_inc;`
`124`	`127`	`t_major = t_minor = t_inc = 0;`
`125`	`128`	`sscanf(p_vers_string, "%d.%d.%d", &t_major, &t_minor, &t_inc);`