Merge lp:~mc-return/compiz/compiz.fix1030473-part2 into lp:compiz/0.9.8

[MC Return]

Fixed various problems described in bug 1030473.
Optimized performance and style following suggestions reported by cppcheck:

1. Used !xxxx.empty() instead of xxxx.size(), because it can be faster. xxxx.size() can take linear time while xxxx.empty() is guaranteed to take constant time.

2. Defensive programming: Reordered array-out-of-bound condition checks such as '(a[i] && i < 10)' to '(i < 10 && a[i])'. That way the array will not be accessed, because the index is checked first.

Fixes various problems described in bug 1030473.

[Sam Spilsbury (smspillaz)]

LGTM

review: Approve

[Daniel van Vugt (vanvugt)]

Looks good and passes basic testing.

review: Approve

=== modified file 'compizconfig/libcompizconfig/src/iniparser.c'
--- compizconfig/libcompizconfig/src/iniparser.c	2007-08-24 13:03:28 +0000
+++ compizconfig/libcompizconfig/src/iniparser.c	2012-07-31 13:52:21 +0000
@@ -120,7 +120,7 @@
     memset (l, 0, ASCIILINESZ + 1);
     i = 0;
 
-    while (s[i] && i < ASCIILINESZ)
+    while (i < ASCIILINESZ && s[i])
     {
 	l[i] = (char) tolower ((int) s[i]);
 	i++;

=== modified file 'plugins/animation/src/extensionplugin.cpp'
--- plugins/animation/src/extensionplugin.cpp	2011-09-15 09:54:32 +0000
+++ plugins/animation/src/extensionplugin.cpp	2012-07-31 13:52:21 +0000
@@ -432,13 +432,13 @@
 		wEnd = wRestacked;
 		wOldAbove = wStart;
 	    }
-	    else if (clients[(unsigned)changeStart] ==
-		     mLastClientList[(unsigned)changeEnd] && // lowered
+	    else if ((unsigned int)changeEnd < n - 1 &&
+		     clients[(unsigned)changeStart] ==
+		     mLastClientList[(unsigned)changeEnd]) // lowered
 		     // We don't animate lowering if there is no
 		     // window above this window, since this window needs
 		     // to be drawn on such a "host" in animPaintWindow
 		     // (at least for now).
-		     (unsigned int)changeEnd < n - 1)
 	    {
 		wRestacked = wChangeStart;
 		wStart = wRestacked;

=== modified file 'plugins/colorfilter/src/colorfilter.cpp'
--- plugins/colorfilter/src/colorfilter.cpp	2010-11-04 13:19:13 +0000
+++ plugins/colorfilter/src/colorfilter.cpp	2012-07-31 13:52:21 +0000
@@ -298,7 +298,7 @@
     /* We are filtering a decoration */
     if ((cfs->optionGetFilterDecorations () &&
 	isFiltered &&
-	cfs->filtersFunctions.size ()))
+	!cfs->filtersFunctions.empty ()))
 	shouldFilter = true;
 
     /* Check if filters have to be loaded and load them if so

=== modified file 'plugins/colorfilter/src/parser.cpp'
--- plugins/colorfilter/src/parser.cpp	2010-11-04 14:47:16 +0000
+++ plugins/colorfilter/src/parser.cpp	2012-07-31 13:52:21 +0000
@@ -435,7 +435,7 @@
 
 		    if (temp == "fragment.texcoord[0]")
 			data->addFetchOp (arg1.c_str (), NULL, target);
-		    else if (offsets.size ())
+		    else if (!offsets.empty ())
 		    {
 			arg2 = programFindOffset (
 					      offsets.begin (),

=== modified file 'plugins/dbus/src/dbus.cpp'
--- plugins/dbus/src/dbus.cpp	2012-06-24 09:00:27 +0000
+++ plugins/dbus/src/dbus.cpp	2012-07-31 13:52:21 +0000
@@ -1525,7 +1525,7 @@
 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
     /* root messages */
-    if (path.size () == 0)
+    if (path.empty ())
     {
 #if GET_PLUGIN_METADATA_ENABLED
 	if (dbus_message_is_method_call (message,

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2012-07-09 11:09:28 +0000
+++ plugins/decor/src/decor.cpp	2012-07-31 13:52:21 +0000
@@ -1327,7 +1327,7 @@
     std::list <Decoration::Ptr>::iterator cit = mList.end ();
     DECOR_WINDOW (w);
 
-    if (mList.size ())
+    if (!mList.empty ())
     {
         const unsigned int typeMatch = (1 << 0);
         const unsigned int stateMatch = (1 << 1);

=== modified file 'plugins/firepaint/src/firepaint.cpp'
--- plugins/firepaint/src/firepaint.cpp	2010-10-23 15:42:02 +0000
+++ plugins/firepaint/src/firepaint.cpp	2012-07-31 13:52:21 +0000
@@ -456,7 +456,7 @@
     float size = 4;
     float bg = (float) optionGetBgBrightness () / 100.0;
 
-    if (init && points.size ())
+    if (init && !points.empty ())
     {
 	ps.initParticles (optionGetNumParticles ());
 	init = false;
@@ -480,7 +480,7 @@
     if (!init)
 	ps.updateParticles (time);
 
-    if (points.size ())
+    if (!points.empty ())
     {
 	float max_new = MIN ((int) ps.particles.size (),  (int) points.size () * 2) *
 			((float) time / 50.0) *

=== modified file 'plugins/grid/src/grid.cpp'
--- plugins/grid/src/grid.cpp	2012-05-27 04:32:55 +0000
+++ plugins/grid/src/grid.cpp	2012-07-31 13:52:21 +0000
@@ -711,7 +711,7 @@
 
 		if (lastSlot != desiredSlot)
 		{
-			if (animations.size ())
+			if (!animations.empty ())
 				/* Begin fading previous animation instance */
 				animations.at (animations.size () - 1).fadingOut = true;
 

=== modified file 'plugins/group/src/init.cpp'
--- plugins/group/src/init.cpp	2012-05-27 04:32:55 +0000
+++ plugins/group/src/init.cpp	2012-07-31 13:52:21 +0000
@@ -118,7 +118,7 @@
 					      glowProperty->textureSize),
 				    GL_RGBA, GL_UNSIGNED_BYTE);
 
-		if (optionGetGlow () && mGroups.size ())
+		if (optionGetGlow () && !mGroups.empty ())
 		{
 		    foreach (CompWindow *w, screen->windows ())
 		    {
@@ -228,7 +228,7 @@
 	 mGrabState == GroupScreen::ScreenGrabTabDrag)
 	 functionsMask |= (GL_PAINT_OUTPUT |
 			   GL_PAINT_TRANSFORMED_OUTPUT);
-    else if (mGroups.size ())
+    else if (!mGroups.empty ())
     {
 	foreach (GroupSelection *group, mGroups)
 	{

=== modified file 'plugins/opacify/src/opacify.cpp'
--- plugins/opacify/src/opacify.cpp	2011-05-27 06:45:52 +0000
+++ plugins/opacify/src/opacify.cpp	2012-07-31 13:52:21 +0000
@@ -235,7 +235,7 @@
     {
 	return false;
     }
-    if (optionGetNoDelayChange () && passive.size ())
+    if (optionGetNoDelayChange () && !passive.empty ())
 	return true;
 
     return false;

=== modified file 'plugins/ring/src/ring.cpp'
--- plugins/ring/src/ring.cpp	2011-02-23 20:59:45 +0000
+++ plugins/ring/src/ring.cpp	2012-07-31 13:52:21 +0000
@@ -1138,7 +1138,7 @@
 
 	/* Terminate if the window closed was the last window in the list */
 
-	if (!mWindows.size ())
+	if (mWindows.empty ())
 	{
 	    CompOption o ("root", CompOption::TypeInt);
 	    CompOption::Vector opts;

=== modified file 'plugins/scale/src/scale.cpp'
--- plugins/scale/src/scale.cpp	2012-06-22 10:10:44 +0000
+++ plugins/scale/src/scale.cpp	2012-07-31 13:52:21 +0000
@@ -517,7 +517,7 @@
 	case ScaleOptions::MultioutputModeOnAllOutputDevices:
 	    {
 		SlotArea::vector slotAreas = getSlotAreas ();
-		if (slotAreas.size ())
+		if (!slotAreas.empty ())
 		{
 		    foreach (SlotArea &sa, slotAreas)
 			layoutSlotsForArea (sa.workArea, sa.nWindows);

=== modified file 'plugins/thumbnail/src/thumbnail.cpp'
--- plugins/thumbnail/src/thumbnail.cpp	2012-05-27 04:32:55 +0000
+++ plugins/thumbnail/src/thumbnail.cpp	2012-07-31 13:52:21 +0000
@@ -803,7 +803,7 @@
     if (oldThumb.opacity > 0.0 && oldThumb.opacity < 1.0)
 	damageThumbs.push_back (&oldThumb);
 
-    if (damageThumbs.size ())
+    if (!damageThumbs.empty ())
     {
 	foreach (Thumbnail *t, damageThumbs)
 	    damageThumbRegion (t);

=== modified file 'plugins/wallpaper/src/wallpaper.cpp'
--- plugins/wallpaper/src/wallpaper.cpp	2011-02-24 06:32:45 +0000
+++ plugins/wallpaper/src/wallpaper.cpp	2012-07-31 13:52:21 +0000
@@ -370,7 +370,7 @@
 {
     screen->handleEvent (event);
 
-    if (!screen->desktopWindowCount () && fakeDesktop == None && backgroundsPrimary.size())
+    if (!screen->desktopWindowCount () && fakeDesktop == None && !backgroundsPrimary.empty())
 	createFakeDesktopWindow ();
 
     if ((screen->desktopWindowCount () > 1 || backgroundsPrimary.empty())
@@ -571,7 +571,7 @@
 {
     WALLPAPER_SCREEN (screen);
 
-    if ((!ws->desktop || ws->desktop == window) && ws->backgroundsPrimary.size() &&
+    if ((!ws->desktop || ws->desktop == window) && !ws->backgroundsPrimary.empty() &&
 	window->alpha () && window->type () & CompWindowTypeDesktopMask)
     {
 	int filterIdx;

=== modified file 'src/match.cpp'
--- src/match.cpp	2012-04-24 16:39:22 +0000
+++ src/match.cpp	2012-07-31 13:52:21 +0000
@@ -391,7 +391,7 @@
 	}
     }
 
-    if (list.size ())
+    if (!list.empty ())
 	list.front ()->flags &= ~MATCH_OP_AND_MASK;
 
 }

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-06-24 09:00:27 +0000
+++ src/screen.cpp	2012-07-31 13:52:21 +0000
@@ -2130,7 +2130,7 @@
 	CompString	  name;
 	CompOption::Value value;
 
-	if (screenInfo.size ())
+	if (!screenInfo.empty ())
 	{
 	    CompOption::Value::Vector l;
 	    foreach (XineramaScreenInfo xi, screenInfo)