[brlcad-commits] SF.net SVN: brlcad:[76922] brlcad/trunk/src/libdm/dm-generic.c

[starseeker--- via brlcad-commits]

Revision: 76922
          http://sourceforge.net/p/brlcad/code/76922
Author:   starseeker
Date:     2020-08-24 15:40:35 +0000 (Mon, 24 Aug 2020)
Log Message:
-----------
Adjust several dm functions to never return NULL.

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

Modified: brlcad/trunk/src/libdm/dm-generic.c
===================================================================
--- brlcad/trunk/src/libdm/dm-generic.c 2020-08-24 15:30:50 UTC (rev 76921)
+++ brlcad/trunk/src/libdm/dm-generic.c 2020-08-24 15:40:35 UTC (rev 76922)
@@ -190,7 +190,7 @@
 const char *
 dm_get_dm_name(const struct dm *dmp)
 {
-    if (UNLIKELY(!dmp)) return NULL;
+    if (UNLIKELY(!dmp)) return "(DM-NULL)";
     return dmp->i->dm_name;
 }
 
@@ -197,7 +197,7 @@
 const char *
 dm_get_dm_lname(struct dm *dmp)
 {
-    if (UNLIKELY(!dmp)) return NULL;
+    if (UNLIKELY(!dmp)) return "(DM-NULL)";
     return dmp->i->dm_lname;
 }
 
@@ -239,7 +239,7 @@
 const char *
 dm_get_type(struct dm *dmp)
 {
-    if (UNLIKELY(!dmp)) return 0;
+    if (UNLIKELY(!dmp)) return "(DM-NULL)";
     return dmp->i->dm_name;
 }
 
@@ -281,7 +281,8 @@
 unsigned char *
 dm_get_bg(struct dm *dmp)
 {
-    if (UNLIKELY(!dmp)) return NULL;
+    static unsigned char dbg[3] = {0, 0, 0};
+    if (UNLIKELY(!dmp)) return dbg;
     return dmp->i->dm_bg;
 }
 
@@ -295,7 +296,8 @@
 unsigned char *
 dm_get_fg(struct dm *dmp)
 {
-    if (UNLIKELY(!dmp)) return NULL;
+    static unsigned char dfg[3] = {0, 0, 0};
+    if (UNLIKELY(!dmp)) return dfg;
     return dmp->i->dm_fg;
 }
 

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



_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits