[brlcad-commits] SF.net SVN: brlcad:[38236] brlcad/trunk/src/libdm

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

Revision: 38236
          http://brlcad.svn.sourceforge.net/brlcad/?rev=38236&view=rev
Author:   brlcad
Date:     2010-03-30 21:11:37 +0000 (Tue, 30 Mar 2010)

Log Message:
-----------
move Nu_open over from dm-Null.c for the temporary.  it's empty and only used in dm-generic right now during a dm_open.  keep until interp can be refactored out and callback added to dm struct.  clean up and reorganize dm-Null.c to avoid all forward declarations and quell all verbose compilation warnings.

Modified Paths:
--------------
    brlcad/trunk/src/libdm/dm-Null.c
    brlcad/trunk/src/libdm/dm-generic.c

Modified: brlcad/trunk/src/libdm/dm-Null.c
===================================================================
--- brlcad/trunk/src/libdm/dm-Null.c	2010-03-30 20:49:42 UTC (rev 38235)
+++ brlcad/trunk/src/libdm/dm-Null.c	2010-03-30 21:11:37 UTC (rev 38236)
@@ -24,7 +24,7 @@
 #include "common.h"
 #include "bio.h"
 
-#define PLOTBOUND       1000.0  /* Max magnification in Rot matrix */
+#define PLOTBOUND 1000.0  /* Max magnification in Rot matrix */
 #include <stdio.h>
 #ifdef HAVE_SYS_TIME_H
 #  include <sys/time.h>
@@ -37,14 +37,63 @@
 #include "dm-Null.h"
 
 
-void	Nu_void(void);
-int	Nu_int0(void);
-struct dm *Nu_open(void);
-unsigned Nu_unsign(void);
-static int     Nu_fg(struct dm *, unsigned char, unsigned char, unsigned char, int strict, fastf_t transparency);
-static int     Nu_bg(struct dm *, unsigned char, unsigned char, unsigned char);
-static int     Nu_dr(struct dm *dmp, struct bn_vlist *(*callback_function)BU_ARGS((void *)), genptr_t *data){return TCL_OK;};
+int
+Nu_int0(void)
+{
+    return TCL_OK;
+}
 
+
+void
+Nu_void(void)
+{
+    return;
+}
+
+
+unsigned int
+Nu_unsign(void)
+{
+    return TCL_OK;
+}
+
+
+HIDDEN int
+Nu_draw(struct dm *dmp, struct bn_vlist *(*callback_function)(void *), genptr_t *data __attribute__((unused)))
+{
+    if (!dmp || !callback_function) {
+	bu_log("WARNING: dmp or callback_function is NULL\n");
+	return TCL_ERROR;
+    }
+
+    return TCL_OK;
+}
+
+
+HIDDEN int
+Nu_fg(struct dm *dmp, unsigned char r, unsigned char g, unsigned char b, int strict, fastf_t transparency)
+{
+    if (!dmp) {
+	bu_log("WARNING: dmp is NULL (r/g/b => %d/%d/%d; strict => %d; transparency => %f)\n", r, g, b, strict, transparency);
+	return TCL_ERROR;
+    }
+
+    return TCL_OK;
+}
+
+
+HIDDEN int
+Nu_bg(struct dm *dmp, unsigned char r, unsigned char g, unsigned char b)
+{
+    if (!dmp) {
+	bu_log("WARNING: dmp is NULL (r/g/b==%d/%d/%d)\n", r, g, b);
+	return TCL_ERROR;
+    }
+
+    return TCL_OK;
+}
+
+
 struct dm dm_Null = {
     Nu_int0,
     Nu_int0,
@@ -58,7 +107,7 @@
     Nu_int0,
     Nu_int0,
     Nu_int0,
-    Nu_dr,
+    Nu_draw,
     Nu_fg,
     Nu_bg,
     Nu_int0,
@@ -107,30 +156,7 @@
     0				/* Tcl interpreter */
 };
 
-int Nu_int0(void) {
-    return TCL_OK;
-}
 
-void Nu_void(void) {
-    return;
-}
-
-struct dm *Nu_open(void) {
-    return DM_NULL;
-}
-
-unsigned Nu_unsign(void) {
-    return TCL_OK;
-}
-
-static int Nu_fg(struct dm *dmp, unsigned char r, unsigned char g, unsigned char b, int strict, fastf_t transparency) {
-    return TCL_OK;
-}
-
-static int Nu_bg(struct dm *dmp, unsigned char r, unsigned char g, unsigned char b) {
-    return TCL_OK;
-}
-
 /*
  * Local Variables:
  * mode: C

Modified: brlcad/trunk/src/libdm/dm-generic.c
===================================================================
--- brlcad/trunk/src/libdm/dm-generic.c	2010-03-30 20:49:42 UTC (rev 38235)
+++ brlcad/trunk/src/libdm/dm-generic.c	2010-03-30 21:11:37 UTC (rev 38236)
@@ -34,7 +34,7 @@
 #include "vmath.h"
 #include "dm.h"
 
-extern struct dm *Nu_open(Tcl_Interp *interp, int argc, char **argv);
+
 extern struct dm *plot_open(Tcl_Interp *interp, int argc, char **argv);
 extern struct dm *ps_open(Tcl_Interp *interp, int argc, char **argv);
 
@@ -65,6 +65,16 @@
 #endif /* DM_WGL */
 
 
+HIDDEN struct dm *
+Nu_open(Tcl_Interp *interp, int argc, char *argv[])
+{
+    if (interp || argc < 0 || !argv)
+	return DM_NULL;
+
+    return DM_NULL;
+}
+
+
 struct dm *
 dm_open(Tcl_Interp *interp, int type, int argc, char **argv)
 {


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