Tidy bitmap effect setters/getters to prevent maybe-uninitialized

peter-b · livecodeali · commit 710c259e91cb · 2017-05-15T11:18:55.000+01:00
Move the bitmap effect property lookup into the block where it is
actually used.  This is both cleaner and prevents
`-Wmaybe-uninitialized` warnings.
diff --git a/engine/src/bitmapeffect.cpp b/engine/src/bitmapeffect.cpp
@@ -678,10 +678,6 @@ bool MCBitmapEffectsGetProperty(MCExecContext& ctxt, MCBitmapEffectsRef& self, M
 		t_effect = &self -> effects[t_type];
 	else
 		t_effect = nil;
-    
-    MCBitmapEffectProperty t_prop;
-    if (!MCNameIsEmpty(p_index) && MCBitmapEffectLookupProperty(t_type, p_index, t_prop) != ES_NORMAL)
-        return false;
 
     if (t_is_array)
     {
@@ -716,6 +712,10 @@ bool MCBitmapEffectsGetProperty(MCExecContext& ctxt, MCBitmapEffectsRef& self, M
     }
     else
     {
+        MCBitmapEffectProperty t_prop;
+        if (MCBitmapEffectLookupProperty(t_type, p_index,
+                                         t_prop) != ES_NORMAL)
+            return false;
         MCBitmapEffectFetchProperty(ctxt, t_effect, t_prop, r_value);
         return true;
     }
@@ -983,7 +983,6 @@ bool MCBitmapEffectsSetProperty(MCExecContext& ctxt, MCBitmapEffectsRef& self, M
 		return true;
     }
     
-    MCBitmapEffectProperty t_prop;
     MCBitmapEffect effect;
     bool t_dirty;
     
@@ -1003,10 +1002,6 @@ bool MCBitmapEffectsSetProperty(MCExecContext& ctxt, MCBitmapEffectsRef& self, M
         t_dirty = true;
     }
     
-    // Lookup the property and ensure it is appropriate for our type.
-    if (!MCNameIsEmpty(p_index) && MCBitmapEffectLookupProperty(t_type, p_index, t_prop) != ES_NORMAL)
-        return false;
-    
     if (t_is_array)
     {
         bool t_dirty_array;
@@ -1037,8 +1032,15 @@ bool MCBitmapEffectsSetProperty(MCExecContext& ctxt, MCBitmapEffectsRef& self, M
         
     }
     else
+    {
+        MCBitmapEffectProperty t_prop;
+        if (MCBitmapEffectLookupProperty(t_type, p_index,
+                                         t_prop) != ES_NORMAL)
+            return false;
+
         MCBitmapEffectStoreProperty(ctxt, effect, t_prop, p_value, t_dirty);
-    
+    }
+
     if (t_dirty)
     {
         // If we are currently empty, then allocate a new object

Original file line number	Diff line number	Diff line change
`@@ -678,10 +678,6 @@ bool MCBitmapEffectsGetProperty(MCExecContext& ctxt, MCBitmapEffectsRef& self, M`
`678`	`678`	`t_effect = &self -> effects[t_type];`
`679`	`679`	`else`
`680`	`680`	`t_effect = nil;`
`681`		`-`
`682`		`- MCBitmapEffectProperty t_prop;`
`683`		`- if (!MCNameIsEmpty(p_index) && MCBitmapEffectLookupProperty(t_type, p_index, t_prop) != ES_NORMAL)`
`684`		`- return false;`
`685`	`681`
`686`	`682`	`if (t_is_array)`
`687`	`683`	`{`
`@@ -716,6 +712,10 @@ bool MCBitmapEffectsGetProperty(MCExecContext& ctxt, MCBitmapEffectsRef& self, M`
`716`	`712`	`}`
`717`	`713`	`else`
`718`	`714`	`{`
	`715`	`+ MCBitmapEffectProperty t_prop;`
	`716`	`+ if (MCBitmapEffectLookupProperty(t_type, p_index,`
	`717`	`+ t_prop) != ES_NORMAL)`
	`718`	`+ return false;`
`719`	`719`	`MCBitmapEffectFetchProperty(ctxt, t_effect, t_prop, r_value);`
`720`	`720`	`return true;`
`721`	`721`	`}`
`@@ -983,7 +983,6 @@ bool MCBitmapEffectsSetProperty(MCExecContext& ctxt, MCBitmapEffectsRef& self, M`
`983`	`983`	`return true;`
`984`	`984`	`}`
`985`	`985`
`986`		`- MCBitmapEffectProperty t_prop;`
`987`	`986`	`MCBitmapEffect effect;`
`988`	`987`	`bool t_dirty;`
`989`	`988`
`@@ -1003,10 +1002,6 @@ bool MCBitmapEffectsSetProperty(MCExecContext& ctxt, MCBitmapEffectsRef& self, M`
`1003`	`1002`	`t_dirty = true;`
`1004`	`1003`	`}`
`1005`	`1004`
`1006`		`- // Lookup the property and ensure it is appropriate for our type.`
`1007`		`- if (!MCNameIsEmpty(p_index) && MCBitmapEffectLookupProperty(t_type, p_index, t_prop) != ES_NORMAL)`
`1008`		`- return false;`
`1009`		`-`
`1010`	`1005`	`if (t_is_array)`
`1011`	`1006`	`{`
`1012`	`1007`	`bool t_dirty_array;`
`@@ -1037,8 +1032,15 @@ bool MCBitmapEffectsSetProperty(MCExecContext& ctxt, MCBitmapEffectsRef& self, M`
`1037`	`1032`
`1038`	`1033`	`}`
`1039`	`1034`	`else`
	`1035`	`+ {`
	`1036`	`+ MCBitmapEffectProperty t_prop;`
	`1037`	`+ if (MCBitmapEffectLookupProperty(t_type, p_index,`
	`1038`	`+ t_prop) != ES_NORMAL)`
	`1039`	`+ return false;`
	`1040`	`+`
`1040`	`1041`	`MCBitmapEffectStoreProperty(ctxt, effect, t_prop, p_value, t_dirty);`
`1041`		`-`
	`1042`	`+ }`
	`1043`	`+`
`1042`	`1044`	`if (t_dirty)`
`1043`	`1045`	`{`
`1044`	`1046`	`// If we are currently empty, then allocate a new object`