[brlcad-commits] SF.net SVN: brlcad:[38341] brlcad/trunk/src/mged/utility1.c

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

Revision: 38341
          http://brlcad.svn.sourceforge.net/brlcad/?rev=38341&view=rev
Author:   brlcad
Date:     2010-04-06 11:49:47 +0000 (Tue, 06 Apr 2010)

Log Message:
-----------
shouldn't cast away the constness.  try propagating it forward.

Modified Paths:
--------------
    brlcad/trunk/src/mged/utility1.c

Modified: brlcad/trunk/src/mged/utility1.c
===================================================================
--- brlcad/trunk/src/mged/utility1.c	2010-04-06 11:42:44 UTC (rev 38340)
+++ brlcad/trunk/src/mged/utility1.c	2010-04-06 11:49:47 UTC (rev 38341)
@@ -240,15 +240,12 @@
 int
 f_edmater(ClientData clientData, Tcl_Interp *interp, int argc, const char **argv)
 {
-    char **av;
-    char **argv_orig;
+    const char **av;
     struct bu_vls editstring;
     int i;
 
     CHECK_DBI_NULL;
 
-    argv_orig = (char **)argv;
-
     if (argc < 2) {
 	struct bu_vls vls;
 
@@ -262,13 +259,13 @@
     bu_vls_init(&editstring);
     get_editor_string(&editstring);
 
-    av = (char **)bu_malloc(sizeof(char *)*(argc + 3), "f_edmater: av");
-    av[0] = argv_orig[0];
+    av = (const char **)bu_malloc(sizeof(char *)*(argc + 3), "f_edmater: av");
+    av[0] = argv[0];
     av[1] = "-E";
-    av[2] = (char *)bu_vls_addr(&editstring);
+    av[2] = (const char *)bu_vls_addr(&editstring);
     argc += 2;
     for (i = 3; i < argc; ++i) {
-	av[i] = argv_orig[i-2];
+	av[i] = argv[i-2];
     }
     av[argc] = NULL;
 


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