[brlcad-commits] SF.net SVN: brlcad:[38259] brlcad/trunk/src/libfb
Open Source Solid Modeling CAD
Brought to you by:
brlcad
Menu
▾
▴
[brlcad-commits] SF.net SVN: brlcad:[38259] brlcad/trunk/src/libfb
|
From: <br...@us...> - 2010-03-31 02:02:53
|
Revision: 38259
http://brlcad.svn.sourceforge.net/brlcad/?rev=38259&view=rev
Author: brlcad
Date: 2010-03-31 02:02:46 +0000 (Wed, 31 Mar 2010)
Log Message:
-----------
take care of a handful of strictness warnings. test params, mark unused params, fix sign conversions, remove unnecessary funcs (tk_close_existing), and lil more.
Modified Paths:
--------------
brlcad/trunk/src/libfb/asize.c
brlcad/trunk/src/libfb/fb_generic.c
brlcad/trunk/src/libfb/fb_obj.c
brlcad/trunk/src/libfb/fb_util.c
brlcad/trunk/src/libfb/fbserv_obj.c
brlcad/trunk/src/libfb/if_tk.c
Modified: brlcad/trunk/src/libfb/asize.c
===================================================================
--- brlcad/trunk/src/libfb/asize.c 2010-03-30 23:54:42 UTC (rev 38258)
+++ brlcad/trunk/src/libfb/asize.c 2010-03-31 02:02:46 UTC (rev 38259)
@@ -171,13 +171,13 @@
* 1 width and height returned
*/
int
-fb_common_image_size(unsigned long int *widthp, unsigned long int *heightp, register unsigned long int npixels)
+fb_common_image_size(unsigned long int *widthp, unsigned long int *heightp, unsigned long int npixels)
/* pointer to returned width */
/* pointer to returned height */
/* Number of pixels */
{
- register struct sizes *sp;
- long int root;
+ struct sizes *sp;
+ unsigned long int root;
if ( npixels <= 0 )
return 0;
Modified: brlcad/trunk/src/libfb/fb_generic.c
===================================================================
--- brlcad/trunk/src/libfb/fb_generic.c 2010-03-30 23:54:42 UTC (rev 38258)
+++ brlcad/trunk/src/libfb/fb_generic.c 2010-03-31 02:02:46 UTC (rev 38259)
@@ -60,6 +60,10 @@
*/
int fb_null(FBIO *ifp)
{
+ if (ifp) {
+ FB_CK_FBIO(ifp);
+ }
+
return 0;
}
@@ -69,8 +73,12 @@
*
* Used by if_*.c routines that don't have programmable cursor patterns.
*/
-int fb_null_setcursor(FBIO *ifp, const unsigned char *bits, int xbits, int ybits, int xorig, int yorig)
+int fb_null_setcursor(FBIO *ifp, const unsigned char *bits __attribute__((unused)), int xbits __attribute__((unused)), int ybits __attribute__((unused)), int xorig __attribute__((unused)), int yorig __attribute__((unused)))
{
+ if (ifp) {
+ FB_CK_FBIO(ifp);
+ }
+
return 0;
}
@@ -306,10 +314,7 @@
{
extern FBIO tk_interface;
if (strcasecmp(ifp->if_name, tk_interface.if_type) == 0) {
- if ((status = tk_close_existing(ifp)) <= -1) {
- fb_log("fb_close_existing: cannot close device \"%s\", ret=%d.\n", ifp->if_name, status);
- return BRLCAD_ERROR;
- }
+ /* may need to close_existing here at some point */
if (ifp->if_pbase != PIXEL_NULL)
free((void *)ifp->if_pbase);
free((void *)ifp->if_name);
Modified: brlcad/trunk/src/libfb/fb_obj.c
===================================================================
--- brlcad/trunk/src/libfb/fb_obj.c 2010-03-30 23:54:42 UTC (rev 38258)
+++ brlcad/trunk/src/libfb/fb_obj.c 2010-03-31 02:02:46 UTC (rev 38259)
@@ -30,6 +30,7 @@
#include "common.h"
#include <stdlib.h>
+#include <strings.h>
#include "bio.h"
#include "tcl.h"
@@ -135,7 +136,7 @@
* procname close
*/
HIDDEN int
-fbo_close_tcl(ClientData clientData, Tcl_Interp *interp, int argc, char **argv)
+fbo_close_tcl(ClientData clientData, Tcl_Interp *interp, int argc, char **argv __attribute__((unused)))
{
struct fb_obj *fbop = (struct fb_obj *)clientData;
struct bu_vls vls;
@@ -161,7 +162,7 @@
* fb_open [name device [args]]
*/
HIDDEN int
-fbo_open_tcl(ClientData clientData, Tcl_Interp *interp, int argc, char **argv)
+fbo_open_tcl(ClientData clientData __attribute__((unused)), Tcl_Interp *interp, int argc, char **argv)
{
struct fb_obj *fbop;
FBIO *ifp;
@@ -354,7 +355,9 @@
int x, y;
struct bu_vls vls;
- if (argc != 2) {
+ if (argc != 2
+ || strcasecmp(argv[1], "getcursor") != 0)
+ {
bu_vls_init(&vls);
bu_vls_printf(&vls, "helplib fb_getcursor");
Tcl_Eval(interp, bu_vls_addr(&vls));
@@ -564,9 +567,9 @@
struct fb_obj *fbop = (struct fb_obj *)clientData;
struct bu_vls vls;
int xmin, ymin;
- int width;
- int height;
- int i;
+ long width;
+ long height;
+ size_t i;
RGBpixel pixel;
unsigned char *pp;
@@ -599,13 +602,13 @@
return TCL_ERROR;
}
- if (sscanf(argv[4], "%d", &width) != 1) {
+ if (sscanf(argv[4], "%ld", &width) != 1) {
Tcl_AppendResult(interp, "fb_cell: bad width - ",
argv[4], (char *)NULL);
return TCL_ERROR;
}
- if (sscanf(argv[5], "%d", &height) != 1) {
+ if (sscanf(argv[5], "%ld", &height) != 1) {
Tcl_AppendResult(interp, "fb_cell: bad height - ",
argv[5], (char *)NULL);
return TCL_ERROR;
@@ -651,7 +654,9 @@
struct fb_obj *fbop = (struct fb_obj *)clientData;
- if (argc != 2) {
+ if (argc != 2
+ || strcasecmp(argv[1], "flush") != 0)
+ {
struct bu_vls vls;
bu_vls_init(&vls);
@@ -677,7 +682,9 @@
struct fb_obj *fbop = (struct fb_obj *)clientData;
struct bu_vls vls;
- if (argc != 2) {
+ if (argc != 2
+ || strcasecmp(argv[1], "getheight") != 0)
+ {
bu_vls_init(&vls);
bu_vls_printf(&vls, "helplib fb_getheight");
Tcl_Eval(interp, bu_vls_addr(&vls));
@@ -704,7 +711,9 @@
struct fb_obj *fbop = (struct fb_obj *)clientData;
struct bu_vls vls;
- if (argc != 2) {
+ if (argc != 2
+ || strcasecmp(argv[1], "getwidth") != 0)
+ {
bu_vls_init(&vls);
bu_vls_printf(&vls, "helplib fb_getwidth");
Tcl_Eval(interp, bu_vls_addr(&vls));
@@ -731,7 +740,10 @@
struct fb_obj *fbop = (struct fb_obj *)clientData;
struct bu_vls vls;
- if (argc != 2) {
+ if (argc != 2
+ || strcasecmp(argv[1], "getsize") != 0)
+ {
+
bu_vls_init(&vls);
bu_vls_printf(&vls, "helplib fb_getsize");
Tcl_Eval(interp, bu_vls_addr(&vls));
@@ -886,6 +898,7 @@
return TCL_OK;
}
+
#if 0
/*
*
Modified: brlcad/trunk/src/libfb/fb_util.c
===================================================================
--- brlcad/trunk/src/libfb/fb_util.c 2010-03-30 23:54:42 UTC (rev 38258)
+++ brlcad/trunk/src/libfb/fb_util.c 2010-03-31 02:02:46 UTC (rev 38259)
@@ -43,6 +43,8 @@
int
fb_sim_view(FBIO *ifp, int xcenter, int ycenter, int xzoom, int yzoom)
{
+ FB_CK_FBIO(ifp);
+
ifp->if_xcenter = xcenter;
ifp->if_ycenter = ycenter;
ifp->if_xzoom = xzoom;
@@ -60,6 +62,8 @@
int
fb_sim_getview(FBIO *ifp, int *xcenter, int *ycenter, int *xzoom, int *yzoom)
{
+ FB_CK_FBIO(ifp);
+
*xcenter = ifp->if_xcenter;
*ycenter = ifp->if_ycenter;
*xzoom = ifp->if_xzoom;
@@ -77,6 +81,8 @@
int
fb_sim_cursor(FBIO *ifp, int mode, int x, int y)
{
+ FB_CK_FBIO(ifp);
+
ifp->if_cursmode = mode;
ifp->if_xcurs = x;
ifp->if_ycurs = y;
@@ -93,6 +99,8 @@
int
fb_sim_getcursor(FBIO *ifp, int *mode, int *x, int *y)
{
+ FB_CK_FBIO(ifp);
+
*mode = ifp->if_cursmode;
*x = ifp->if_xcurs;
*y = ifp->if_ycurs;
@@ -105,12 +113,20 @@
int
fb_reset(FBIO *ifp)
{
+ if (ifp) {
+ FB_CK_FBIO(ifp);
+ }
+
return 0;
}
int
-fb_viewport(FBIO *ifp, int left, int top, int right, int bottom)
+fb_viewport(FBIO *ifp, int left __attribute__((unused)), int top __attribute__((unused)), int right __attribute__((unused)), int bottom __attribute__((unused)))
{
+ if (ifp) {
+ FB_CK_FBIO(ifp);
+ }
+
return 0;
}
@@ -120,6 +136,10 @@
int xcenter, ycenter;
int xzoom, yzoom;
+ if (ifp) {
+ FB_CK_FBIO(ifp);
+ }
+
fb_getview(ifp, &xcenter, &ycenter, &xzoom, &yzoom);
xcenter = x;
ycenter = y;
@@ -132,6 +152,10 @@
int xcenter, ycenter;
int xzoom, yzoom;
+ if (ifp) {
+ FB_CK_FBIO(ifp);
+ }
+
fb_getview(ifp, &xcenter, &ycenter, &xzoom, &yzoom);
xzoom = x;
yzoom = y;
@@ -139,8 +163,12 @@
}
int
-fb_scursor(FBIO *ifp, int mode, int x, int y)
+fb_scursor(FBIO *ifp, int mode __attribute__((unused)), int x __attribute__((unused)), int y __attribute__((unused)))
{
+ if (ifp) {
+ FB_CK_FBIO(ifp);
+ }
+
/* We could actually implement this but it
* is probably of no value.
*/
Modified: brlcad/trunk/src/libfb/fbserv_obj.c
===================================================================
--- brlcad/trunk/src/libfb/fbserv_obj.c 2010-03-30 23:54:42 UTC (rev 38258)
+++ brlcad/trunk/src/libfb/fbserv_obj.c 2010-03-31 02:02:46 UTC (rev 38259)
@@ -34,6 +34,9 @@
#include <stdio.h>
#include <ctype.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#ifdef HAVE_WINSOCK_H
# include <process.h>
# include <winsock.h>
@@ -363,7 +366,7 @@
* Accept any new client connections.
*/
HIDDEN void
-new_client_handler(ClientData clientData, int mask)
+new_client_handler(ClientData clientData, int mask __attribute__((unused)))
{
struct fbserv_listener *fbslp = (struct fbserv_listener *)clientData;
struct fbserv_obj *fbsp = fbslp->fbsl_fbsp;
@@ -441,7 +444,7 @@
* Process arrivals from existing clients.
*/
HIDDEN void
-existing_client_handler(ClientData clientData, int mask)
+existing_client_handler(ClientData clientData, int mask __attribute__((unused)))
{
register int i;
struct fbserv_client *fbscp = (struct fbserv_client *)clientData;
@@ -608,14 +611,15 @@
void
fbs_rfbread(struct pkg_conn *pcp, char *buf)
{
- int x, y, num;
+ int x, y;
+ size_t num;
int ret;
static unsigned char *scanbuf = NULL;
- static int buflen = 0;
+ static size_t buflen = 0;
x = pkg_glong( &buf[0*NET_LONG_LEN] );
y = pkg_glong( &buf[1*NET_LONG_LEN] );
- num = pkg_glong( &buf[2*NET_LONG_LEN] );
+ num = (size_t)pkg_glong( &buf[2*NET_LONG_LEN] );
if ( num*sizeof(RGBpixel) > buflen ) {
if ( scanbuf != NULL )
@@ -667,10 +671,10 @@
{
int xmin, ymin;
int width, height;
- int num;
+ size_t num;
int ret;
static unsigned char *scanbuf = NULL;
- static int buflen = 0;
+ static size_t buflen = 0;
xmin = pkg_glong( &buf[0*NET_LONG_LEN] );
ymin = pkg_glong( &buf[1*NET_LONG_LEN] );
@@ -998,6 +1002,9 @@
void
fbs_rfbpoll(struct pkg_conn *pcp, char *buf)
{
+ if (pcp == PKC_ERROR)
+ return;
+
(void)fb_poll( curr_fbp );
if ( buf ) (void)free(buf);
}
Modified: brlcad/trunk/src/libfb/if_tk.c
===================================================================
--- brlcad/trunk/src/libfb/if_tk.c 2010-03-30 23:54:42 UTC (rev 38258)
+++ brlcad/trunk/src/libfb/if_tk.c 2010-03-31 02:02:46 UTC (rev 38259)
@@ -74,12 +74,7 @@
char *tkwrite_buffer;
-int tk_close_existing()
-{
- return 0;
-}
-
HIDDEN int fb_tk_open(FBIO *ifp, char *file, int width, int height),
fb_tk_close(FBIO *ifp),
tk_clear(FBIO *ifp, unsigned char *pp),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|