[fusion-commits] Compiz configuration system library: Changes to 'master' (f0cd24b70d2a052294e43d24d849c4d7fcff9f49)

[maniac at server.beryl-project.org]

New commits:
commit f0cd24b70d2a052294e43d24d849c4d7fcff9f49
Author: Danny Baumann <dannybaumann at web.de>
Date:   Mon Aug 6 10:38:15 2007 +0200

    Add missing NULL check.
    Minor cleanup.


 plugin/ccp.c |   24 +++++++-----------------
 1 files changed, 7 insertions(+), 17 deletions(-)


Modified: fusion/compizconfig/libcompizconfig/plugin/ccp.c
===================================================================
--- fusion/compizconfig/libcompizconfig/plugin/ccp.c
+++ fusion/compizconfig/libcompizconfig/plugin/ccp.c
@@ -841,26 +841,16 @@ ccpInitDisplay (CompPlugin  *p,
 
     cd->applyingSettings = FALSE;
 
-    s = d->screens;
-    i = 0;
-
-    while (s)
+    for (s = d->screens, i = 0; s; s = s->next, i++);
+    screens = calloc (i, sizeof (unsigned int));
+    if (!screens)
     {
-	i++;
-	s = s->next;
+	free (cd);
+	return FALSE;
     }
 
-    screens = calloc (1, sizeof (unsigned int) * i);
-
-    s = d->screens;
-    i = 0;
-
-    while (s)
-    {
-	screens[i] = s->screenNum;
-	i++;
-	s = s->next;
-    }
+    for (s = d->screens, i = 0; s; s = s->next)
+	screens[i++] = s->screenNum;
 
     ccsSetBasicMetadata (TRUE);