Changeset 2673 for neercs/trunkTweet

Timestamp:

Aug 5, 2008, 2:19:39 PM (13 years ago)

Author:

Pascal Terjan

Message:

• As to_grab and to_start are now part of screen_list, no need to have them as parameters

Location:

neercs/trunk/src

Files:

• main.c (modified) (1 diff)
• neercs.h (modified) (1 diff)
• server.c (modified) (5 diffs)

neercs/trunk/src/main.c

@@ -194 +194 @@
     if(!screen_list->attach)
     {
-        if(start_server(screen_list->to_grab, screen_list->to_start, screen_list))
+        if(start_server(screen_list))
             goto end;
     }

neercs/trunk/src/neercs.h

@@ -237 +237 @@
 char * connect_socket(struct screen_list* screen_list, enum socket_type socktype);
 char ** list_sockets(char *socket_dir, char *session_name);
-int start_server(int *to_grab, char **to_start, struct screen_list *screen_list);
+int start_server(struct screen_list *screen_list);
 int send_event(caca_event_t ev, struct screen_list* screen_list);
 

neercs/trunk/src/server.c

@@ -108 +108 @@
 }
 
-static int server_main(int *to_grab, char **to_start, struct screen_list *screen_list)
+static int server_main(struct screen_list *screen_list)
 {
     int i;
@@ -131 +131 @@
                                           + screen_list->status);
 
-    if(!to_grab && !to_start)
+    if(!screen_list->to_grab && !screen_list->to_start)
     {
         add_screen(screen_list,
@@ -140 +140 @@
 
     /* Attach processes */
-    if(to_grab)
-    {
-        for(i=0; to_grab[i]; i++)
+    if(screen_list->to_grab)
+    {
+        for(i=0; screen_list->to_grab[i]; i++)
         {
             add_screen(screen_list,
                        create_screen_grab(screen_list->width,
                                           screen_list->height,
-                                          to_grab[i]));
-        }
-        free(to_grab);
+                                          screen_list->to_grab[i]));
+        }
+        free(screen_list->to_grab);
+        screen_list->to_grab = NULL;
     }
 
     /* Launch command line processes */
-    if(to_start)
-    {
-        for(i=0; to_start[i]; i++)
+    if(screen_list->to_start)
+    {
+        for(i=0; screen_list->to_start[i]; i++)
         {
             add_screen(screen_list,
                        create_screen(screen_list->width,
                                      screen_list->height,
-                                     to_start[i]));
-        }
-        free(to_start);
+                                     screen_list->to_start[i]));
+            free(screen_list->to_start[i]);
+        }
+        free(screen_list->to_start);
+        screen_list->to_start = NULL;
     }
 
@@ -401 +404 @@
 }
 
-int start_server(int *to_grab, char **to_start, struct screen_list *screen_list)
+int start_server(struct screen_list *screen_list)
 {
     pid_t pid;
@@ -435 +438 @@
 #endif
         setsid();
-        return server_main(to_grab, to_start, screen_list);
+        return server_main(screen_list);
     }
     create_socket(screen_list, SOCK_CLIENT);