Revision: 40764
http://brlcad.svn.sourceforge.net/brlcad/?rev=40764&view=rev
Author: brlcad
Date: 2010-09-28 19:27:29 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
pkg_switches now take a fourth parameter. set to NULL.
Modified Paths:
--------------
brlcad/trunk/src/libfb/fbserv_obj.c
brlcad/trunk/src/libfb/if_remote.c
Modified: brlcad/trunk/src/libfb/fbserv_obj.c
===================================================================
--- brlcad/trunk/src/libfb/fbserv_obj.c 2010-09-28 19:16:12 UTC (rev 40763)
+++ brlcad/trunk/src/libfb/fbserv_obj.c 2010-09-28 19:27:29 UTC (rev 40764)
@@ -796,37 +796,37 @@
int fd = fbslp->fbsl_fd;
static struct pkg_switch pswitch[] = {
- { MSG_FBOPEN, fbs_rfbopen, "Open Framebuffer" },
- { MSG_FBCLOSE, fbs_rfbclose, "Close Framebuffer" },
- { MSG_FBCLEAR, fbs_rfbclear, "Clear Framebuffer" },
- { MSG_FBREAD, fbs_rfbread, "Read Pixels" },
- { MSG_FBWRITE, fbs_rfbwrite, "Write Pixels" },
- { MSG_FBWRITE + MSG_NORETURN, fbs_rfbwrite, "Asynch write" },
- { MSG_FBCURSOR, fbs_rfbcursor, "Cursor" },
- { MSG_FBGETCURSOR, fbs_rfbgetcursor, "Get Cursor" }, /*NEW*/
- { MSG_FBSCURSOR, fbs_rfbscursor, "Screen Cursor" }, /*OLD*/
- { MSG_FBWINDOW, fbs_rfbwindow, "Window" }, /*OLD*/
- { MSG_FBZOOM, fbs_rfbzoom, "Zoom" }, /*OLD*/
- { MSG_FBVIEW, fbs_rfbview, "View" }, /*NEW*/
- { MSG_FBGETVIEW, fbs_rfbgetview, "Get View" }, /*NEW*/
- { MSG_FBRMAP, fbs_rfbrmap, "R Map" },
- { MSG_FBWMAP, fbs_rfbwmap, "W Map" },
- { MSG_FBHELP, fbs_rfbhelp, "Help Request" },
- { MSG_ERROR, fbs_rfbunknown, "Error Message" },
- { MSG_CLOSE, fbs_rfbunknown, "Close Connection" },
- { MSG_FBREADRECT, fbs_rfbreadrect, "Read Rectangle" },
- { MSG_FBWRITERECT, fbs_rfbwriterect, "Write Rectangle" },
- { MSG_FBWRITERECT + MSG_NORETURN, fbs_rfbwriterect, "Write Rectangle" },
- { MSG_FBBWREADRECT, fbs_rfbbwreadrect, "Read BW Rectangle" },
- { MSG_FBBWWRITERECT, fbs_rfbbwwriterect, "Write BW Rectangle" },
- { MSG_FBBWWRITERECT+MSG_NORETURN, fbs_rfbbwwriterect, "Write BW
Rectangle" },
- { MSG_FBFLUSH, fbs_rfbflush, "Flush Output" },
- { MSG_FBFLUSH + MSG_NORETURN, fbs_rfbflush, "Flush Output" },
- { MSG_FBFREE, fbs_rfbfree, "Free Resources" },
- { MSG_FBPOLL, fbs_rfbpoll, "Handle Events" },
- { MSG_FBSETCURSOR, fbs_rfbsetcursor, "Set Cursor Shape" },
- { MSG_FBSETCURSOR + MSG_NORETURN, fbs_rfbsetcursor, "Set Cursor Shape"
},
- { 0, NULL, NULL }
+ { MSG_FBOPEN, fbs_rfbopen, "Open Framebuffer", NULL },
+ { MSG_FBCLOSE, fbs_rfbclose, "Close Framebuffer", NULL },
+ { MSG_FBCLEAR, fbs_rfbclear, "Clear Framebuffer", NULL },
+ { MSG_FBREAD, fbs_rfbread, "Read Pixels", NULL },
+ { MSG_FBWRITE, fbs_rfbwrite, "Write Pixels", NULL },
+ { MSG_FBWRITE + MSG_NORETURN, fbs_rfbwrite, "Asynch write", NULL },
+ { MSG_FBCURSOR, fbs_rfbcursor, "Cursor", NULL },
+ { MSG_FBGETCURSOR, fbs_rfbgetcursor, "Get Cursor", NULL }, /*NEW*/
+ { MSG_FBSCURSOR, fbs_rfbscursor, "Screen Cursor", NULL }, /*OLD*/
+ { MSG_FBWINDOW, fbs_rfbwindow, "Window", NULL }, /*OLD*/
+ { MSG_FBZOOM, fbs_rfbzoom, "Zoom", NULL }, /*OLD*/
+ { MSG_FBVIEW, fbs_rfbview, "View", NULL }, /*NEW*/
+ { MSG_FBGETVIEW, fbs_rfbgetview, "Get View", NULL }, /*NEW*/
+ { MSG_FBRMAP, fbs_rfbrmap, "R Map", NULL },
+ { MSG_FBWMAP, fbs_rfbwmap, "W Map", NULL },
+ { MSG_FBHELP, fbs_rfbhelp, "Help Request", NULL },
+ { MSG_ERROR, fbs_rfbunknown, "Error Message", NULL },
+ { MSG_CLOSE, fbs_rfbunknown, "Close Connection", NULL },
+ { MSG_FBREADRECT, fbs_rfbreadrect, "Read Rectangle", NULL },
+ { MSG_FBWRITERECT, fbs_rfbwriterect, "Write Rectangle", NULL },
+ { MSG_FBWRITERECT + MSG_NORETURN, fbs_rfbwriterect, "Write Rectangle",
NULL },
+ { MSG_FBBWREADRECT, fbs_rfbbwreadrect, "Read BW Rectangle", NULL },
+ { MSG_FBBWWRITERECT, fbs_rfbbwwriterect, "Write BW Rectangle", NULL },
+ { MSG_FBBWWRITERECT+MSG_NORETURN, fbs_rfbbwwriterect, "Write BW
Rectangle", NULL },
+ { MSG_FBFLUSH, fbs_rfbflush, "Flush Output", NULL },
+ { MSG_FBFLUSH + MSG_NORETURN, fbs_rfbflush, "Flush Output", NULL },
+ { MSG_FBFREE, fbs_rfbfree, "Free Resources", NULL },
+ { MSG_FBPOLL, fbs_rfbpoll, "Handle Events", NULL },
+ { MSG_FBSETCURSOR, fbs_rfbsetcursor, "Set Cursor Shape", NULL },
+ { MSG_FBSETCURSOR + MSG_NORETURN, fbs_rfbsetcursor, "Set Cursor Shape",
NULL },
+ { 0, NULL, NULL, NULL }
};
#if defined(_WIN32) && !defined(__CYGWIN__)
Modified: brlcad/trunk/src/libfb/if_remote.c
===================================================================
--- brlcad/trunk/src/libfb/if_remote.c 2010-09-28 19:16:12 UTC (rev 40763)
+++ brlcad/trunk/src/libfb/if_remote.c 2010-09-28 19:27:29 UTC (rev 40764)
@@ -67,8 +67,8 @@
/* Package Handlers. */
static void pkgerror(struct pkg_conn *pcpp, char *buf); /* error
message handler */
static struct pkg_switch pkgswitch[] = {
- { MSG_ERROR, pkgerror, "Error Message" },
- { 0, NULL, NULL }
+ { MSG_ERROR, pkgerror, "Error Message", NULL },
+ { 0, NULL, NULL, NULL }
};
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
