[brlcad-commits] SF.net SVN: brlcad:[59204] brlcad/trunk/src/librt

[<tbr...@us...>]

Revision: 59204
          http://sourceforge.net/p/brlcad/code/59204
Author:   tbrowder2
Date:     2013-12-27 17:30:11 +0000 (Fri, 27 Dec 2013)
Log Message:
-----------
avoid const char errors for C++

Modified Paths:
--------------
    brlcad/trunk/src/librt/db_lookup.c
    brlcad/trunk/src/librt/prep.c
    brlcad/trunk/src/librt/primitives/ars/ars.c

Modified: brlcad/trunk/src/librt/db_lookup.c
===================================================================
--- brlcad/trunk/src/librt/db_lookup.c	2013-12-27 17:26:25 UTC (rev 59203)
+++ brlcad/trunk/src/librt/db_lookup.c	2013-12-27 17:30:11 UTC (rev 59204)
@@ -192,7 +192,7 @@
 {
     struct directory **headp;
     struct directory *dp;
-    char *tmp_ptr;
+    const char *tmp_ptr;
     struct bu_vls local = BU_VLS_INIT_ZERO;
 
     RT_CK_DBI(dbip);

Modified: brlcad/trunk/src/librt/prep.c
===================================================================
--- brlcad/trunk/src/librt/prep.c	2013-12-27 17:26:25 UTC (rev 59203)
+++ brlcad/trunk/src/librt/prep.c	2013-12-27 17:30:11 UTC (rev 59204)
@@ -1338,7 +1338,7 @@
 obj_in_path(const char *path, const char *obj)
 {
     size_t obj_len=strlen(obj);
-    char *ptr;
+    const char *ptr;
 
     ptr = strstr(path, obj);
 

Modified: brlcad/trunk/src/librt/primitives/ars/ars.c
===================================================================
--- brlcad/trunk/src/librt/primitives/ars/ars.c	2013-12-27 17:26:25 UTC (rev 59203)
+++ brlcad/trunk/src/librt/primitives/ars/ars.c	2013-12-27 17:30:11 UTC (rev 59204)
@@ -1151,7 +1151,7 @@
     } else if (BU_STR_EQUAL(attr, "PPC")) {
 	bu_vls_printf(logstr, "%zu", ars->pts_per_curve);
     } else if (attr[0] == 'C') {
-	char *ptr;
+	const char *ptr;
 
 	if (attr[1] == '\0') {
 	    /* all the curves */
@@ -1178,7 +1178,9 @@
 		return BRLCAD_ERROR;
 	    }
 	    j = atoi((ptr+1));
+	    /* FIXME: is this necessary? modifiying a const char is illegal!
 	    *ptr = '\0';
+	    */
 	    i = atoi(&attr[1]);
 	    bu_vls_printf(logstr, "%.25g %.25g %.25g",
 			  V3ARGS(&ars->curves[i][j*3]));
@@ -1278,7 +1280,7 @@
 	    }
 	} else if (argv[0][0] == 'C') {
 	    if (isdigit((int)argv[0][1])) {
-		char *ptr;
+		const char *ptr;
 
 		/* a specific curve */
 		ptr = strchr(argv[0], 'P');
@@ -1296,16 +1298,17 @@
 		    }
 		} else {
 		    char *dupstr;
+		    char *ptr2;
 
 		    /* one complete curve */
 		    i = atoi(&argv[0][1]);
 		    len = ars->pts_per_curve * 3;
 		    dupstr = bu_strdup(argv[1]);
-		    ptr = dupstr;
-		    while (*ptr) {
-			if (*ptr == '{' || *ptr == '}')
-			    *ptr = ' ';
-			ptr++;
+		    ptr2 = dupstr;
+		    while (*ptr2) {
+			if (*ptr2 == '{' || *ptr2 == '}')
+			    *ptr2 = ' ';
+			ptr2++;
 		    }
 		    if (!ars->curves[i]) {
 			ars->curves[i] = (fastf_t *)bu_calloc(ars->pts_per_curve * 3, sizeof(fastf_t), "ars->curves[i]");

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