[maemo-commits] [maemo-commits] r14920 - in projects/haf/trunk/maemo-launcher: . launcher

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2007-12-07 21:19:24 +0200 (Fri, 07 Dec 2007)
New Revision: 14920

Modified:
   projects/haf/trunk/maemo-launcher/ChangeLog
   projects/haf/trunk/maemo-launcher/launcher/launcher.c
Log:
Use new child_clone() function to copy child structures


Modified: projects/haf/trunk/maemo-launcher/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-launcher/ChangeLog	2007-12-07 19:06:20 UTC (rev 14919)
+++ projects/haf/trunk/maemo-launcher/ChangeLog	2007-12-07 19:19:24 UTC (rev 14920)
@@ -1,5 +1,10 @@
 2007-12-07  Guillem Jover  <guillem.jover at nokia.com>
 
+	* launcher/launcher.c (child_clone): New function.
+	(kindergarten_insert_child): Use child_clone instead of inline copy.
+
+2007-12-07  Guillem Jover  <guillem.jover at nokia.com>
+
 	* launcher/launcher.c (alloc_childs): Rename to ...
 	(kindergarten_new): ... this. Rename childs to kg. Fix all callers.
 	(grow_childs): Rename to ...

Modified: projects/haf/trunk/maemo-launcher/launcher/launcher.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/launcher.c	2007-12-07 19:06:20 UTC (rev 14919)
+++ projects/haf/trunk/maemo-launcher/launcher/launcher.c	2007-12-07 19:19:24 UTC (rev 14920)
@@ -357,6 +357,12 @@
   exit(0);
 }
 
+static inline void
+child_clone(child_t *a, child_t *b)
+{
+  *a = *b;
+}
+
 static void
 child_destroy(child_t *child)
 {
@@ -472,9 +478,7 @@
     return false;
   }
 
-  kg->list[id].name = child->name;
-  kg->list[id].sock = child->sock;
-  kg->list[id].pid = child->pid;
+  child_clone(&kg->list[id], child);
   kg->used++;
 
   return true;