[Brlcad-commits] CVS: brlcad/src/libfb fbserv_obj.c,14.9,14.10 fbserv_obj_win32.c,14.8,14.9

[Sean M. <br...@us...>]

Update of /cvsroot/brlcad/brlcad/src/libfb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2927/src/libfb

Modified Files:
	fbserv_obj.c fbserv_obj_win32.c 
Log Message:
change from HIDDEN to static, ws, use fbmsg.h

Index: fbserv_obj.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/libfb/fbserv_obj.c,v
retrieving revision 14.9
retrieving revision 14.10
diff -w -u -r14.9 -r14.10
--- fbserv_obj.c	21 Jan 2006 17:02:45 -0000	14.9
+++ fbserv_obj.c	22 Jan 2006 10:20:20 -0000	14.10
@@ -18,7 +18,6 @@
  * License along with this file; see the file named COPYING for more
  * information.
  */
-
 /** \addtogroup fb */
 /*@{*/
 /** @file fbserv_obj.c
@@ -40,11 +39,8 @@
  *
  */
 /*@}*/
-
 #include "common.h"
 
-
-
 #include <stdio.h>
 #include <ctype.h>
 
@@ -58,17 +54,17 @@
 #include "raytrace.h"
 #include "dm.h"
 
-#include "./pkgtypes.h"
+#include "fbmsg.h"
 
 int fbs_open(Tcl_Interp *interp, struct fbserv_obj *fbsp, int port);
 int fbs_close(Tcl_Interp *interp, struct fbserv_obj *fbsp);
 
-HIDDEN void new_client(struct fbserv_obj *fbsp, struct pkg_conn *pcp);
-HIDDEN void drop_client(struct fbserv_obj *fbsp, int sub);
-HIDDEN void new_client_handler(ClientData clientData, int mask);
-HIDDEN void existing_client_handler(ClientData clientData, int mask);
-HIDDEN void comm_error(char *str);
-HIDDEN void setup_socket(int fd);
+static void new_client(struct fbserv_obj *fbsp, struct pkg_conn *pcp);
+static void drop_client(struct fbserv_obj *fbsp, int sub);
+static void new_client_handler(ClientData clientData, int mask);
+static void existing_client_handler(ClientData clientData, int mask);
+static void comm_error(char *str);
+static void setup_socket(int fd);
 
 /*
  * Package Handlers.
@@ -120,7 +116,7 @@
 	{ 0,			NULL,		NULL }
 };
 
-HIDDEN FBIO *curr_fbp;		/* current framebuffer pointer */
+static FBIO *curr_fbp;		/* current framebuffer pointer */
 
 int
 fbs_open(Tcl_Interp *interp, struct fbserv_obj *fbsp, int port)
@@ -190,7 +186,7 @@
 /*
  *			N E W _ C L I E N T
  */
-HIDDEN void
+static void
 new_client(struct fbserv_obj *fbsp, struct pkg_conn *pcp)
 {
   register int	i;
@@ -222,7 +218,7 @@
 /*
  *			D R O P _ C L I E N T
  */
-HIDDEN void
+static void
 drop_client(struct fbserv_obj *fbsp, int sub)
 {
   if(fbsp->fbs_clients[sub].fbsc_pkg != PKC_NULL)  {
@@ -240,7 +236,7 @@
 /*
  * Accept any new client connections.
  */
-HIDDEN void
+static void
 new_client_handler(ClientData clientData, int mask)
 {
   struct fbserv_listener *fbslp = (struct fbserv_listener *)clientData;
@@ -253,7 +249,7 @@
 /*
  * Process arrivals from existing clients.
  */
-HIDDEN void
+static void
 existing_client_handler(ClientData clientData, int mask)
 {
   register int i;
@@ -288,7 +284,7 @@
     fbsp->fbs_callback(fbsp->fbs_clientData);
 }
 
-HIDDEN void
+static void
 setup_socket(int fd)
 {
   int on = 1;
@@ -327,7 +323,7 @@
  *
  *  Communication error.  An error occured on the PKG link.
  */
-HIDDEN void
+static void
 comm_error(char *str)
 {
   bu_log(str);

Index: fbserv_obj_win32.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/libfb/fbserv_obj_win32.c,v
retrieving revision 14.8
retrieving revision 14.9
diff -w -u -r14.8 -r14.9
--- fbserv_obj_win32.c	18 Jan 2006 06:46:16 -0000	14.8
+++ fbserv_obj_win32.c	22 Jan 2006 10:20:20 -0000	14.9
@@ -18,7 +18,6 @@
  * License along with this file; see the file named COPYING for more
  * information.
  */
-
 /** \addtogroup fb */
 /*@{*/
 /** @file fbserv_obj_win32.c
@@ -40,11 +39,8 @@
  *
  */
 /*@}*/
-
 #include "common.h"
 
-
-
 #include <stdio.h>
 #include <ctype.h>
 
@@ -54,17 +50,17 @@
 #include "vmath.h"
 #include "raytrace.h"
 #include "dm.h"
-#include "../libfb/pkgtypes.h"
+#include "fbmsg.h"
 
 int fbs_open();
 int fbs_close();
 
-HIDDEN void new_client();
-HIDDEN void drop_client();
-HIDDEN void new_client_handler();
-HIDDEN void existing_client_handler();
-HIDDEN void comm_error();
-HIDDEN void setup_socket();
+static void new_client();
+static void drop_client();
+static void new_client_handler();
+static void existing_client_handler();
+static void comm_error();
+static void setup_socket();
 
 /*
  * Package Handlers.
@@ -116,7 +112,7 @@
 	{ 0,			NULL,		NULL }
 };
 
-HIDDEN FBIO *curr_fbp;		/* current framebuffer pointer */
+static FBIO *curr_fbp;		/* current framebuffer pointer */
 
 int
 fbs_open(interp, fbsp, port)
@@ -138,7 +134,7 @@
 /*
  *			N E W _ C L I E N T
  */
-HIDDEN void
+static void
 new_client(fbsp, pcp)
      struct fbserv_obj *fbsp;
      struct pkg_conn	*pcp;
@@ -149,7 +145,7 @@
 /*
  *			D R O P _ C L I E N T
  */
-HIDDEN void
+static void
 drop_client(fbsp, sub)
      struct fbserv_obj *fbsp;
      int sub;
@@ -160,7 +156,7 @@
 /*
  * Accept any new client connections.
  */
-HIDDEN void
+static void
 new_client_handler(clientData, mask)
 ClientData clientData;
 int mask;
@@ -171,7 +167,7 @@
 /*
  * Process arrivals from existing clients.
  */
-HIDDEN void
+static void
 existing_client_handler(clientData, mask)
 ClientData clientData;
 int mask;
@@ -179,7 +175,7 @@
 	return;
 }
 
-HIDDEN void
+static void
 setup_socket(fd)
 int	fd;
 {
@@ -191,7 +187,7 @@
  *
  *  Communication error.  An error occured on the PKG link.
  */
-HIDDEN void
+static void
 comm_error(str)
 char *str;
 {