Merge lp:~mc-return/compiz/compiz.merge-performance-do-not-assign-values-that-are-never-used into lp:compiz/0.9.9

[MC Return]

Minor Performance Optimization:
Do not assign values to variables, if those variables are assigned a new value, before the old one was ever used.

[Sam Spilsbury (smspillaz)]

IMO its good defensive coding practise to initialize every variable before use because it insures against further changes using uninitialized variables.

I'd like to hear the converse argument though. I think the compiler will just optimize out any redundancy really.

review: Needs Information

[MC Return (mc-return)]

> IMO its good defensive coding practise to initialize every variable before use
> because it insures against further changes using uninitialized variables.
>
> I'd like to hear the converse argument though. I think the compiler will just
> optimize out any redundancy really.

I do not trust every compiler to be that intelligent. If you assign a value to a local variable and then several instructions later reassign another value to it, without having used the first, the compiler will probably do what he is told to and make this first redundant assignment...

Also it is really ugly to find something in the code like this:

mState = saveState;
mState = saveState;

...even if the compiler would remove that one probably...

[Sam Spilsbury (smspillaz)]

On Tue, Nov 20, 2012 at 7:04 AM, MC Return <email address hidden> wrote:
>> IMO its good defensive coding practise to initialize every variable before use
>> because it insures against further changes using uninitialized variables.
>>
>> I'd like to hear the converse argument though. I think the compiler will just
>> optimize out any redundancy really.
>
> I do not trust every compiler to be that intelligent.

We are only using gcc . Clang is used to do some additional error
checking but that's about it.

> If you assign a value to a local variable and then several instructions later reassign another value to it, without having used the first, the compiler will probably do what he is told to and make this first redundant assignment...

The compiler can optimize out all zero-initializations in C for non
plain-old-data types allocated on the stack frame as long as they
aren't marked volatile:

http://en.wikipedia.org/wiki/Dead_store

That's not the case for C++ classes though, which can change program
state when their constructors run, so it is good style to only declare
those variables when they are actually needed.

I guess the point I'm trying to make here is that zero initialization
makes sense when the code changes and is later recompiled, for
example:

Foo *foo = NULL;

/* blah blah blah */

foo = new Foo ();

changed to:

Foo *foo = NULL;

if (foo)
{
    /* do something with foo */
}

It becomes immediately obvious to the person who changed it that foo
needs to be assigned to a value first, rather than:

Foo *foo;

if (foo)
{
}

Where foo could be anything and that if condition will pass (and the
program then becomes undefined)

>
> Also it is really ugly to find something in the code like this:
>
> mState = saveState;
> mState = saveState;

In which case the second assignment is probably the one you want to remove.

>
> ...even if the compiler would remove that one probably...
>
>
> --
> https://code.launchpad.net/~mc-return/compiz/compiz.merge-performance-do-not-assign-values-that-are-never-used/+merge/135150
> You are reviewing the proposed merge of lp:~mc-return/compiz/compiz.merge-performance-do-not-assign-values-that-are-never-used into lp:compiz.

--
Sam Spilsbury

[Daniel van Vugt (vanvugt)]

I agree the nicest way to achieve this is usually to do it on a single line:
    Foo *x = something
However that's only valid in C++ and not in C.

So in C, I think the existing redundant initialization is the preferred method of defence.

Also note, this is not a significant performance issue. Assigning a word-sized variable to zero or NULL is such a simple instruction that any modern CPU from the last 20 years can do several of them per clock cycle. You'd have to be doing millions or billions of redundant assignments for it to be a problem (for example in a very tight performance-sensitive loop).

review: Disapprove

[MC Return (mc-return)]

> I agree the nicest way to achieve this is usually to do it on a single line:
> Foo *x = something
> However that's only valid in C++ and not in C.
>
> So in C, I think the existing redundant initialization is the preferred method
> of defence.
>

I can remove the changes to the NULL pointer initialization in the .c files of course,
but I do want to note here that all of those pointers get to point to something else
a few lines later and of course are not used without pointing to something and being
initialized first.

> Also note, this is not a significant performance issue. Assigning a word-sized
> variable to zero or NULL is such a simple instruction that any modern CPU from
> the last 20 years can do several of them per clock cycle. You'd have to be
> doing millions or billions of redundant assignments for it to be a problem
> (for example in a very tight performance-sensitive loop).

I am sorry, but I cannot help myself - If I see something that *might* produce any
unneeded instructions I want to remove it, because it hurts my eyes ;)

[Sam Spilsbury (smspillaz)]

On Thu, Nov 22, 2012 at 7:49 AM, MC Return <email address hidden> wrote:
>> I agree the nicest way to achieve this is usually to do it on a single line:
>> Foo *x = something
>> However that's only valid in C++ and not in C.
>>
>> So in C, I think the existing redundant initialization is the preferred method
>> of defence.
>>
>
> I can remove the changes to the NULL pointer initialization in the .c files of course,
> but I do want to note here that all of those pointers get to point to something else
> a few lines later and of course are not used without pointing to something and being
> initialized first.

If one compiled without optimization this would be an issue, however
just for show, for a simple C program
that looks like this:

#include <stdio.h>

int main()
{
        int a = 5;
        int *i;

        a = 1;
        a = a + 1;
        a = a + 2;

        i = &a;

        printf ("%d\n", *i);
        return 0;
}

Will output assembly:

        .file "main.c"
        .section .rodata.str1.1,"aMS",@progbits,1
.LC0:
        .string "%d\n"
        .section .text.startup,"ax",@progbits
        .p2align 4,,15
        .globl main
        .type main, @function
main:
.LFB24:
        .cfi_startproc
        subq $8, %rsp
        .cfi_def_cfa_offset 16
        movl $4, %edx
        movl $.LC0, %esi
        movl $1, %edi
        xorl %eax, %eax
        call __printf_chk
        xorl %eax, %eax
        addq $8, %rsp
        .cfi_def_cfa_offset 8
        ret
        .cfi_endproc
.LFE24:
        .size main, .-main
        .ident "GCC: (Ubuntu/Linaro 4.7.2-11ubuntu1) 4.7.2"
        .section .note.GNU-stack,"",@progbits

And a similar program with i initialized to null:

        .file "main.c"
        .section .rodata.str1.1,"aMS",@progbits,1
.LC0:
        .string "%d\n"
        .section .text.startup,"ax",@progbits
        .p2align 4,,15
        .globl main
        .type main, @function
main:
.LFB24:
        .cfi_startproc
        subq $8, %rsp
        .cfi_def_cfa_offset 16
        movl $4, %edx
        movl $.LC0, %esi
        movl $1, %edi
        xorl %eax, %eax
        call __printf_chk
        xorl %eax, %eax
        addq $8, %rsp
        .cfi_def_cfa_offset 8
        ret
        .cfi_endproc
.LFE24:
        .size main, .-main
        .ident "GCC: (Ubuntu/Linaro 4.7.2-11ubuntu1) 4.7.2"
        .section .note.GNU-stack,"",@progbits

So the null initialization is effectively removed by the compiler if
it isn't used.

>
>> Also note, this is not a significant performance issue. Assigning a word-sized
>> variable to zero or NULL is such a simple instruction that any modern CPU from
>> the last 20 years can do several of them per clock cycle. You'd have to be
>> doing millions or billions of redundant assignments for it to be a problem
>> (for example in a very tight performance-sensitive loop).
>
> I am sorry, but I cannot help myself - If I see something that *might* produce any
> unneeded instructions I want to remove it, because it hurts my eyes ;)

Well, there's a difference between un-needed instructions generally in
the most performant ve...

Unmerged revisions

3511. By MC Return on 2012-11-20

Do not assign 0 to int i, because this value is never used

3510. By MC Return on 2012-11-20

Do not assign 0 to int i, because this value is never used

3509. By MC Return on 2012-11-20

Do not assign output to the ints lco, tco, bco and rco, because this value is never used afterwards

3508. By MC Return on 2012-11-20

Do not assign NULL to EGLImageKHR eglImage, because this value is not used afterwards

3507. By MC Return on 2012-11-20

Do not assign 0 to CompWindow *cw, because this value is not used afterwards

3506. By MC Return on 2012-11-20

Do not assign 0 to XRectangle *shapeRects, because this value is not used afterwards

3505. By MC Return on 2012-11-20

Do not assign 0 to Xrectangle *shapeRects, because this value is not used afterwards

3504. By MC Return on 2012-11-20

Do not assign NULL to CompOption *option, because this value is not used afterwards

3503. By MC Return on 2012-11-20

Do not assign 0 to int output, because this value never gets used

3502. By MC Return on 2012-11-20

Do not assign 0 to int unit, because this value is never used

=== modified file 'compizconfig/gconf/src/gconf.c'
--- compizconfig/gconf/src/gconf.c	2012-08-16 17:00:25 +0000
+++ compizconfig/gconf/src/gconf.c	2012-11-20 14:15:25 +0000
@@ -970,7 +970,7 @@
 static char*
 getCurrentProfileName (void)
 {
-    GConfSchema *schema = NULL;
+    GConfSchema *schema;
 
     schema = gconf_client_get_schema (client,
     				      COMPIZCONFIG "/current_profile", NULL);
 
=== modified file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c'
--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c	2012-10-09 10:56:58 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c	2012-11-20 14:15:25 +0000
@@ -96,7 +96,7 @@
 							      const char *path,
 							      CCSContext *context)
 {
-    CCSGSettingsWrapper *settingsObj = NULL;
+    CCSGSettingsWrapper *settingsObj;
     gchar *schemaName = getSchemaNameForPlugin (plugin);
     GVariant        *writtenPlugins;
     gsize            newWrittenPluginsSize;
 
=== modified file 'compizconfig/gsettings/gsettings_backend_shared/gsettings_util.c'
--- compizconfig/gsettings/gsettings_backend_shared/gsettings_util.c	2012-11-16 16:17:59 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/gsettings_util.c	2012-11-20 14:15:25 +0000
@@ -77,7 +77,7 @@
 gchar *
 getSchemaNameForPlugin (const char *plugin)
 {
-    gchar       *schemaName =  NULL;
+    gchar       *schemaName;
 
     schemaName = g_strconcat (PLUGIN_SCHEMA_ID_PREFIX, plugin, NULL);
 
@@ -96,8 +96,8 @@
 char *
 translateUnderscoresToDashesForGSettings (const char *truncated)
 {
-    gchar *clean        = NULL;
-    gchar **delimited   = NULL;
+    gchar *clean;
+    gchar **delimited;
 
     /* Replace underscores with dashes */
     delimited = g_strsplit (truncated, "_", 0);
@@ -136,8 +136,8 @@
 gchar *
 translateKeyForCCS (const char *gsettingName)
 {
-    gchar *clean        = NULL;
-    gchar **delimited   = NULL;
+    gchar *clean;
+    gchar **delimited;
 
     /* Replace dashes with underscores */
     delimited = g_strsplit (gsettingName, "-", 0);
@@ -1065,7 +1065,7 @@
 CCSGSettingsWrapper *
 getSettingsObjectForCCSSetting (CCSBackend *backend, CCSSetting *setting)
 {
-    CCSGSettingsWrapper *ret = NULL;
+    CCSGSettingsWrapper *ret;
     gchar *pathName = makeSettingPath (ccsGSettingsBackendGetCurrentProfile (backend), setting);
 
     ret = ccsGSettingsGetSettingsObjectForPluginWithPath (backend,
@@ -1085,7 +1085,7 @@
     GVariant        *plugins;
     GVariant        *profiles;
     const char      *currentProfile = ccsGSettingsBackendGetCurrentProfile (backend);
-    gboolean        ret = FALSE;
+    gboolean        ret;
 
     plugins = ccsGSettingsBackendGetPluginsWithSetKeys (backend);
     profiles = ccsGSettingsBackendGetExistingProfiles (backend);
 
=== modified file 'compizconfig/integration/gnome/src/ccs_gnome_integration.c'
--- compizconfig/integration/gnome/src/ccs_gnome_integration.c	2012-10-18 06:29:46 +0000
+++ compizconfig/integration/gnome/src/ccs_gnome_integration.c	2012-11-20 14:15:25 +0000
@@ -639,7 +639,7 @@
 	}
 	else
 	{
-	    CCSPlugin     *plugin = NULL;
+	    CCSPlugin     *plugin;
 	    CCSSetting    *setting;
 
 	    plugin = ccsFindPlugin (priv->context, pluginName);
 
=== modified file 'compizconfig/libcompizconfig/backend/src/ini.c'
--- compizconfig/libcompizconfig/backend/src/ini.c	2012-08-01 10:25:15 +0000
+++ compizconfig/libcompizconfig/backend/src/ini.c	2012-11-20 14:15:25 +0000
@@ -56,7 +56,7 @@
 static char*
 getIniFileName (char *profile)
 {
-    char *configDir = NULL;
+    char *configDir;
     char *fileName = NULL;
 
     configDir = getenv ("XDG_CONFIG_HOME");
@@ -644,7 +644,7 @@
     CCSStringList  ret = NULL;
     char	   *filePath = NULL;
     char           *homeDir = NULL;
-    char	   *configDir = NULL;
+    char	   *configDir;
     
     configDir = getenv ("XDG_CONFIG_HOME");
     if (configDir && strlen (configDir))
 
=== modified file 'compizconfig/libcompizconfig/src/compiz.cpp'
--- compizconfig/libcompizconfig/src/compiz.cpp	2012-08-15 10:19:02 +0000
+++ compizconfig/libcompizconfig/src/compiz.cpp	2012-11-20 14:15:25 +0000
@@ -729,7 +729,7 @@
 		 const OptionMetadata & option)
 {
     const char *name;
-    Bool readonly = FALSE;
+    Bool readonly;
 
     name = option.name ().c_str ();
 
@@ -1158,7 +1158,7 @@
 static Bool
 nodeExists (xmlNode * node, const char *path)
 {
-    xmlNode **nodes = NULL;
+    xmlNode **nodes;
     int num;
     nodes = getNodesFromXPath (node->doc, node, path, &num);
 
 
=== modified file 'compizconfig/libcompizconfig/src/config.c'
--- compizconfig/libcompizconfig/src/config.c	2012-05-21 09:36:37 +0000
+++ compizconfig/libcompizconfig/src/config.c	2012-11-20 14:15:25 +0000
@@ -32,7 +32,7 @@
 static char*
 getConfigFileName (void)
 {
-    char *configDir = NULL;
+    char *configDir;
     char *fileName = NULL;
 
     configDir = getenv ("XDG_CONFIG_HOME");
 
=== modified file 'compizconfig/libcompizconfig/src/main.c'
--- compizconfig/libcompizconfig/src/main.c	2012-11-19 06:07:45 +0000
+++ compizconfig/libcompizconfig/src/main.c	2012-11-20 14:15:25 +0000
@@ -3031,7 +3031,7 @@
 {
     CCSPluginList ap = ccsGetActivePluginList (context);
     CCSPluginList list;
-    CCSPlugin *p = NULL;
+    CCSPlugin *p;
     CCSString *strCore = calloc (1, sizeof (CCSString));
 
     strCore->value = strdup ("core");
@@ -4022,8 +4022,8 @@
 static void
 addBackendInfo (CCSBackendInfoList * bl, char *file)
 {
-    void *dlhand = NULL;
-    char *err = NULL;
+    void *dlhand;
+    char *err;
     Bool found = FALSE;
 
     dlerror ();
@@ -4696,7 +4696,7 @@
 ccsSettingsUpgradeNew (const char *path, const char *name)
 {
     CCSSettingsUpgrade *upgrade = calloc (1, sizeof (CCSSettingsUpgrade));
-    char *upgradeName = strdup (name);
+    char *upgradeName;
     unsigned int fnlen = strlen (path) + strlen (name) + 1;
 
     upgrade->file = calloc (fnlen + 1, sizeof (char));
 
=== modified file 'gtk/window-decorator/events.c'
--- gtk/window-decorator/events.c	2012-10-06 16:11:05 +0000
+++ gtk/window-decorator/events.c	2012-11-20 14:15:25 +0000
@@ -827,7 +827,7 @@
 
     if (d)
     {
-	event_callback cb = NULL;
+	event_callback cb;
 	Bool           send_enter = FALSE;
 	Bool           send_leave = FALSE;
 	BoxPtr         entered_box;
 
=== modified file 'gtk/window-decorator/gwd-settings-notified.c'
--- gtk/window-decorator/gwd-settings-notified.c	2012-09-06 10:12:08 +0000
+++ gtk/window-decorator/gwd-settings-notified.c	2012-11-20 14:15:25 +0000
@@ -256,7 +256,7 @@
     static const guint gwd_settings_notified_impl_n_construction_properties = 1;
     GValue	       wnck_screen_value = G_VALUE_INIT;
     GParameter	       params[gwd_settings_notified_impl_n_construction_properties];
-    GWDSettingsNotified *notified = NULL;
+    GWDSettingsNotified *notified;
 
     g_value_init (&wnck_screen_value, G_TYPE_OBJECT);
     g_value_set_object (&wnck_screen_value, G_OBJECT (screen));
 
=== modified file 'gtk/window-decorator/gwd-settings-storage-gconf.c'
--- gtk/window-decorator/gwd-settings-storage-gconf.c	2012-09-06 10:08:25 +0000
+++ gtk/window-decorator/gwd-settings-storage-gconf.c	2012-11-20 14:15:25 +0000
@@ -409,7 +409,7 @@
     GValue             writable_value = G_VALUE_INIT;
     static const guint gwd_settings_storage_gconf_n_construction_params = 1;
     GParameter         param[gwd_settings_storage_gconf_n_construction_params];
-    GWDSettingsStorage *storage = NULL;
+    GWDSettingsStorage *storage;
 
     g_value_init (&writable_value, G_TYPE_POINTER);
     g_value_set_pointer (&writable_value, writable);
 
=== modified file 'gtk/window-decorator/gwd-settings-storage-gsettings.c'
--- gtk/window-decorator/gwd-settings-storage-gsettings.c	2012-09-10 09:19:31 +0000
+++ gtk/window-decorator/gwd-settings-storage-gsettings.c	2012-11-20 14:15:25 +0000
@@ -400,7 +400,7 @@
     GValue gwd_value = G_VALUE_INIT;
     GValue writable_value = G_VALUE_INIT;
 
-    GWDSettingsStorage *storage = NULL;
+    GWDSettingsStorage *storage;
 
     g_return_val_if_fail (writable != NULL, NULL);
 
 
=== modified file 'gtk/window-decorator/gwd-settings-xproperty-storage.c'
--- gtk/window-decorator/gwd-settings-xproperty-storage.c	2012-09-06 10:08:25 +0000
+++ gtk/window-decorator/gwd-settings-xproperty-storage.c	2012-11-20 14:15:25 +0000
@@ -262,7 +262,7 @@
 {
     static const guint          gwd_settings_xprop_storage_n_construction_params = 3;
     GParameter                  param[gwd_settings_xprop_storage_n_construction_params];
-    GWDSettingsXPropertyStorage *storage = NULL;
+    GWDSettingsXPropertyStorage *storage;
 
     GValue display_value = G_VALUE_INIT;
     GValue root_window_value = G_VALUE_INIT;
 
=== modified file 'kde/window-decorator-kde4/switcher.cpp'
--- kde/window-decorator-kde4/switcher.cpp	2012-08-05 14:21:43 +0000
+++ kde/window-decorator-kde4/switcher.cpp	2012-11-20 14:15:25 +0000
@@ -222,7 +222,7 @@
 void
 KWD::Switcher::updateWindowProperties ()
 {
-    long	    *data = NULL;
+    long	    *data;
     decor_quad_t    quads[N_QUADS_MAX];
     unsigned int    nOffset = 1, frameType = 0, frameState = 0, frameActions = 0;
     int		    nQuad;
 
=== modified file 'kde/window-decorator-kde4/window.cpp'
--- kde/window-decorator-kde4/window.cpp	2012-11-14 10:17:09 +0000
+++ kde/window-decorator-kde4/window.cpp	2012-11-20 14:15:25 +0000
@@ -1257,7 +1257,6 @@
     mDecor->borders (normExtents.left, normExtents.right,
 		     normExtents.top, normExtents.bottom);
     mState = saveState;
-    mState = saveState;
     mDecor->borders (mBorder.left, mBorder.right, mBorder.top, mBorder.bottom);
 
     left = mExtents.left;
@@ -1337,7 +1336,7 @@
       else
       {
 	  decor_quad_t *q = quads;
-	  int n = 0;
+	  int n;
 	  
 	  // top
 	  n = decor_set_horz_quad_line (q, left, 0, right, 0, -top, 0,
 
=== modified file 'plugins/bicubic/src/bicubic.cpp'
--- plugins/bicubic/src/bicubic.cpp	2010-09-30 22:21:03 +0000
+++ plugins/bicubic/src/bicubic.cpp	2012-11-20 14:15:25 +0000
@@ -150,7 +150,7 @@
     {
 	GLFragment::Attrib fa = attrib;
 	int            function, param;
-	int            unit = 0;
+	int            unit;
 	
 	param = fa.allocParameters (3);
 	unit  = fa.allocTextureUnits (1);
 
=== modified file 'plugins/cube/src/cube.cpp'
--- plugins/cube/src/cube.cpp	2012-10-16 09:28:45 +0000
+++ plugins/cube/src/cube.cpp	2012-11-20 14:15:25 +0000
@@ -1311,7 +1311,7 @@
     bool                wasCulled = false;
     bool                paintCaps;
     int                 cullNorm, cullInv;
-    int                 output = 0;
+    int                 output;
 
     output = ((unsigned int) outputPtr->id () != (unsigned int) ~0) ?
     							   outputPtr->id () : 0;
 
=== modified file 'plugins/dbus/src/dbus.cpp'
--- plugins/dbus/src/dbus.cpp	2012-08-03 10:12:25 +0000
+++ plugins/dbus/src/dbus.cpp	2012-11-20 14:15:25 +0000
@@ -326,7 +326,7 @@
 				   DBusMessage    *message,
 				   char           **path)
 {
-    CompOption *option = NULL;
+    CompOption *option;
     int nOptions;
 
     xmlTextWriterPtr writer;
 
=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2012-11-05 20:50:59 +0000
+++ plugins/decor/src/decor.cpp	2012-11-20 14:15:25 +0000
@@ -2552,7 +2552,7 @@
 			if (dw->inputFrame ==
 			    ((XShapeEvent *) event)->window)
 			{
-			    XRectangle *shapeRects = 0;
+			    XRectangle *shapeRects;
 			    int order, n;
 
 			    dw->frameRegion = CompRegion ();
@@ -2578,7 +2578,7 @@
 			else if (dw->outputFrame ==
 			         ((XShapeEvent *) event)->window)
 			{
-			    XRectangle *shapeRects = 0;
+			    XRectangle *shapeRects;
 			    int order, n;
 
 			    dw->frameRegion = CompRegion ();
 
=== modified file 'plugins/grid/src/grid.cpp'
--- plugins/grid/src/grid.cpp	2012-11-18 12:18:19 +0000
+++ plugins/grid/src/grid.cpp	2012-11-20 14:15:25 +0000
@@ -128,7 +128,7 @@
 			    bool	       key)
 {
     Window     xid;
-    CompWindow *cw = 0;
+    CompWindow *cw;
 
     xid = CompOption::getIntOptionNamed (option, "window");
     cw  = screen->findWindow (xid);
 
=== modified file 'plugins/opengl/src/texture.cpp'
--- plugins/opengl/src/texture.cpp	2012-09-19 12:18:34 +0000
+++ plugins/opengl/src/texture.cpp	2012-11-20 14:15:25 +0000
@@ -479,7 +479,7 @@
 
     GLTexture::List   rv (1);
     EglTexture        *tex = NULL;
-    EGLImageKHR       eglImage = NULL;
+    EGLImageKHR       eglImage;
     GLTexture::Matrix matrix = _identity_matrix;
 
     const EGLint img_attribs[] = {
 
=== modified file 'plugins/resize/src/logic/src/resize-logic.cpp'
--- plugins/resize/src/logic/src/resize-logic.cpp	2012-09-05 16:42:03 +0000
+++ plugins/resize/src/logic/src/resize-logic.cpp	2012-11-20 14:15:25 +0000
@@ -1365,8 +1365,6 @@
 		bool sb = mScreen->outputDevs ().at (output).workArea ().bottom () <
 			  w->serverGeometry ().bottom ();
 
-		lco = tco = bco = rco = output;
-
 		/* Prevent resizing beyond work area edges when resize is
 		   initiated externally (e.g. with window frame or menu)
 		   and not with a key (e.g. alt+button) */
 
=== modified file 'plugins/workarounds/src/workarounds.cpp'
--- plugins/workarounds/src/workarounds.cpp	2012-08-09 07:09:41 +0000
+++ plugins/workarounds/src/workarounds.cpp	2012-11-20 14:15:25 +0000
@@ -567,7 +567,7 @@
 void
 WorkaroundsScreen::setWindowState (unsigned int state, Window id)
 {
-    int i = 0;
+    int i;
     Atom data[32];
 
     i = compiz::window::fillStateData (state, data);
 
=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-11-13 07:56:49 +0000
+++ src/screen.cpp	2012-11-20 14:15:25 +0000
@@ -1583,7 +1583,7 @@
 void
 PrivateScreen::setWindowState (unsigned int state, Window id)
 {
-    int i = 0;
+    int i;
     Atom data[32];
 
     i = compiz::window::fillStateData (state, data);