Merge lp:~mc-return/compiz/compiz.merge-fix1101405-src-session.cpp-cleanup into lp:compiz/0.9.10

[MC Return]

src/session.cpp cleanup:

Declaration and assignment of local variables in one line.
(this *should* fix bug #1101405)
Use pre- instead of postfix increments.
Added and removed newlines.
Added missing break (just a style issue).
Fixed indentation.

(LP: #1101405)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3754
http://jenkins.qa.ubuntu.com/job/compiz-ci/236/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/277/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/49

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/236/rebuild

review: Needs Fixing (continuous-integration)

[MC Return (mc-return)]

Hmm, seems unrelated:

99% tests passed, 2 tests failed out of 1474

Total Test time (real) = 2447.30 sec

The following tests FAILED:
 1269 - DecorPixmapProtocolDeleteEndToEnd.TestFreeNotFoundWindowPixmapImmediately (Failed)
 1455 - CompizXorgSystemStackingTest.TestCreateRelativeToDestroyedWindowFindsAnotherAppropriatePosition (Failed)

[MC Return (mc-return)]

review: Needs Resubmitting

[Sam Spilsbury (smspillaz)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-autolanding/123/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-autolanding/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-autolanding/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-autolanding/35/console
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/839

review: Needs Fixing (continuous-integration)

[MC Return (mc-return)]

The Jenkins failures seem to be unrelated - Re-approving.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/session.cpp'
--- src/session.cpp	2013-01-19 11:23:07 +0000
+++ src/session.cpp	2013-07-04 16:12:36 +0000
@@ -45,19 +45,19 @@
 
 #define SM_DEBUG(x)
 
-static SmcConn		 smcConnection;
+static SmcConn           smcConnection;
 static CompWatchFdHandle iceWatchFdHandle;
-static bool		 connected = false;
-static bool		 iceConnected = false;
+static bool              connected    = false;
+static bool              iceConnected = false;
 static char              *smClientId, *smPrevClientId;
 
 static void iceInit (void);
 
 static void
-setStringListProperty (SmcConn	  connection,
+setStringListProperty (SmcConn    connection,
 		       const char *name,
 		       const char **values,
-		       int	  nValues)
+		       int        nValues)
 {
     SmProp prop, *pProp;
 
@@ -65,10 +65,11 @@
     prop.type = const_cast<char *> (SmLISTofARRAY8);
 
     prop.vals = (SmPropValue *) malloc (nValues * sizeof (SmPropValue));
+
     if (!prop.vals)
 	return;
 
-    for (int i = 0; i < nValues; i++)
+    for (int i = 0; i < nValues; ++i)
     {
 	prop.vals[i].value = (char *) values[i];
 	prop.vals[i].length = strlen (values[i]);
@@ -86,20 +87,19 @@
 static void
 setCloneRestartCommands (SmcConn connection)
 {
-    const char **args;
-
     /* at maximum, we pass our old arguments + our new client id
        to the SM, so allocate for that case */
-    args = (const char **) malloc ((programArgc + 2) * sizeof (char *));
+    const char **args = (const char **) malloc ((programArgc + 2) * sizeof (char *));
+
     if (!args)
 	return;
 
     int i, count = 0;
 
-    for (i = 0; i < programArgc; i++)
+    for (i = 0; i < programArgc; ++i)
     {
 	if (strcmp (programArgv[i], "--sm-client-id") == 0)
-	    i++; /* skip old client id, we'll add the new one later */
+	    ++i; /* skip old client id, we'll add the new one later */
 	else if (strcmp (programArgv[i], "--replace") == 0)
 	    continue; /* there's nothing to replace when starting session */
 	else
@@ -112,9 +112,10 @@
        position 0 is the executable name */
     for (i = count - 1; i >= 1; i--)
 	args[i + 2] = args[i];
+
     args[1] = "--sm-client-id";
     args[2] = smClientId;
-    count += 2;
+    count  += 2;
 
     setStringListProperty (connection, SmRestartCommand, args, count);
 
@@ -125,14 +126,14 @@
 setRestartStyle (SmcConn connection,
 		 char    hint)
 {
-    SmProp	prop, *pProp;
+    SmProp      prop, *pProp;
     SmPropValue propVal;
 
-    prop.name = const_cast<char *> (SmRestartStyleHint);
-    prop.type = const_cast<char *> (SmCARD8);
-    prop.num_vals = 1;
-    prop.vals = &propVal;
-    propVal.value = &hint;
+    prop.name      = const_cast<char *> (SmRestartStyleHint);
+    prop.type      = const_cast<char *> (SmCARD8);
+    prop.num_vals  = 1;
+    prop.vals      = &propVal;
+    propVal.value  = &hint;
     propVal.length = 1;
 
     pProp = &prop;
@@ -141,9 +142,9 @@
 }
 
 static void
-setProgramInfo (SmcConn    connection,
-		pid_t      pid,
-		uid_t      uid)
+setProgramInfo (SmcConn connection,
+		pid_t   pid,
+		uid_t   uid)
 {
     SmProp        progProp, pidProp, userProp;
     SmPropValue   progVal, pidVal, userVal;
@@ -173,6 +174,7 @@
     props[count++] = &pidProp;
 
     pw = getpwuid (uid);
+
     if (pw)
     {
 	userProp.name     = const_cast<char *> (SmUserID);
@@ -189,19 +191,19 @@
 }
 
 static void
-saveYourselfCallback (SmcConn	connection,
+saveYourselfCallback (SmcConn   connection,
 		      SmPointer client_data,
-		      int	saveType,
-		      Bool	shutdown,
-		      int	interact_Style,
-		      Bool	fast)
+		      int       saveType,
+		      Bool      shutdown,
+		      int       interact_Style,
+		      Bool      fast)
 {
     CompOption::Vector args;
 
-    args.push_back (CompOption ("save_type", CompOption::TypeInt));
-    args.push_back (CompOption ("shutdown", CompOption::TypeBool));
+    args.push_back (CompOption ("save_type",      CompOption::TypeInt));
+    args.push_back (CompOption ("shutdown",       CompOption::TypeBool));
     args.push_back (CompOption ("interact_style", CompOption::TypeInt));
-    args.push_back (CompOption ("fast", CompOption::TypeBool));
+    args.push_back (CompOption ("fast",           CompOption::TypeBool));
 
     args[0].value ().set (saveType);
     args[1].value ().set ((bool) shutdown);
@@ -254,13 +256,13 @@
 	callbacks.save_yourself.callback    = saveYourselfCallback;
 	callbacks.save_yourself.client_data = NULL;
 
-	callbacks.die.callback	  = dieCallback;
+	callbacks.die.callback    = dieCallback;
 	callbacks.die.client_data = NULL;
 
 	callbacks.save_complete.callback    = saveCompleteCallback;
 	callbacks.save_complete.client_data = NULL;
 
-	callbacks.shutdown_cancelled.callback	 = shutdownCancelledCallback;
+	callbacks.shutdown_cancelled.callback    = shutdownCancelledCallback;
 	callbacks.shutdown_cancelled.client_data = NULL;
 
 	smcConnection = SmcOpenConnection (NULL,
@@ -268,7 +270,7 @@
 					   SmProtoMajor,
 					   SmProtoMinor,
 					   SmcSaveYourselfProcMask |
-					   SmcDieProcMask	   |
+					   SmcDieProcMask          |
 					   SmcSaveCompleteProcMask |
 					   SmcShutdownCancelledProcMask,
 					   &callbacks,
@@ -283,10 +285,11 @@
 	else
 	{
 	    connected = true;
+
 	    if (prevClientId)
 		smPrevClientId = strdup (prevClientId);
+
 	    setRestartStyle (smcConnection, SmRestartImmediately);
-	    
 	}
     }
 }
@@ -306,6 +309,7 @@
 	    free (smClientId);
 	    smClientId = NULL;
 	}
+
 	if (smPrevClientId)
 	{
 	    free (smPrevClientId);
@@ -320,14 +324,21 @@
     if (!connected)
 	return "";
 
-    switch (type) {
+    switch (type)
+    {
 	case CompSession::ClientId:
 	    if (smClientId)
 		return smClientId;
+
 	    break;
+
 	case CompSession::PrevClientId:
 	    if (smPrevClientId)
 		return smPrevClientId;
+
+	    break;
+
+	default:
 	    break;
     }
 
@@ -341,11 +352,9 @@
 static bool
 iceProcessMessages (IceConn connection)
 {
-    IceProcessMessagesStatus status;
-
     SM_DEBUG (printf ("ICE connection process messages\n"));
 
-    status = IceProcessMessages (connection, NULL, NULL);
+    IceProcessMessagesStatus status = IceProcessMessages (connection, NULL, NULL);
 
     if (status == IceProcessMessagesIOError)
     {