[G15daemon-commits] SF.net SVN: g15daemon: [135] trunk/g15daemon-wip

[<mla...@us...>]

Revision: 135
          http://svn.sourceforge.net/g15daemon/?rev=135&view=rev
Author:   mlampard
Date:     2006-11-12 22:12:28 -0800 (Sun, 12 Nov 2006)

Log Message:
-----------
more cleanups

Modified Paths:
--------------
    trunk/g15daemon-wip/g15daemon/g15daemon.h
    trunk/g15daemon-wip/g15daemon/linked_lists.c
    trunk/g15daemon-wip/plugins/g15_plugin_net.c

Modified: trunk/g15daemon-wip/g15daemon/g15daemon.h
===================================================================
--- trunk/g15daemon-wip/g15daemon/g15daemon.h	2006-11-13 05:58:55 UTC (rev 134)
+++ trunk/g15daemon-wip/g15daemon/g15daemon.h	2006-11-13 06:12:28 UTC (rev 135)
@@ -182,9 +182,6 @@
 
 #ifdef G15DAEMON_BUILD
 /* internal g15daemon-only functions */
-/* call create_lcd for every new client, and quit it when done */
-lcd_t * ll_create_lcd ();
-void ll_quit_lcd (lcd_t * lcd);
 void uf_write_buf_to_g15(lcd_t *lcd);
 
 /* linked lists */

Modified: trunk/g15daemon-wip/g15daemon/linked_lists.c
===================================================================
--- trunk/g15daemon-wip/g15daemon/linked_lists.c	2006-11-13 05:58:55 UTC (rev 134)
+++ trunk/g15daemon-wip/g15daemon/linked_lists.c	2006-11-13 06:12:28 UTC (rev 135)
@@ -34,7 +34,7 @@
 extern unsigned int client_handles_keys;
 extern plugin_info_t *generic_info;
 
-lcd_t * ll_create_lcd () {
+lcd_t static * ll_create_lcd () {
 
     lcd_t *lcd = g15daemon_xmalloc (sizeof (lcd_t));
     lcd->max_x = LCD_WIDTH;
@@ -51,7 +51,7 @@
     return (lcd);
 }
 
-void ll_quit_lcd (lcd_t * lcd) {
+static void ll_quit_lcd (lcd_t * lcd) {
     free (lcd->g15plugin);
     free (lcd);
 }

Modified: trunk/g15daemon-wip/plugins/g15_plugin_net.c
===================================================================
--- trunk/g15daemon-wip/plugins/g15_plugin_net.c	2006-11-13 05:58:55 UTC (rev 134)
+++ trunk/g15daemon-wip/plugins/g15_plugin_net.c	2006-11-13 06:12:28 UTC (rev 135)
@@ -73,7 +73,7 @@
          }
      } else */
     if(msgbuf[0] == CLIENT_CMD_SWITCH_PRIORITIES){
-        send_event(lcdnode,G15_EVENT_REQ_PRIORITY,1);
+        g15daemon_send_event(lcdnode,G15_EVENT_REQ_PRIORITY,1);
     }
     else if(msgbuf[0] == CLIENT_CMD_IS_FOREGROUND) 
     { /* client wants to know if it's currently viewable */
@@ -371,7 +371,7 @@
 
     if((g15_socket = init_sockserver())<0){
         g15daemon_log(LOG_ERR,"Unable to initialise the server at port %i",LISTEN_PORT);
-        return NULL;
+        return;
     }
 
     if (fcntl(g15_socket, F_SETFL, O_NONBLOCK) <0 ) {
@@ -383,7 +383,7 @@
     }
 
     close(g15_socket);
-    return NULL;
+    return;
 }
 
 /* incoming events */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.