[brlcad-commits] SF.net SVN: brlcad:[48743] brlcad/trunk/src/libged/edcodes.c

[bob1961]

Revision: 48743
          http://brlcad.svn.sourceforge.net/brlcad/?rev=48743&view=rev
Author:   bob1961
Date:     2012-01-13 17:09:55 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
run 8, CID 198, DEADCODE.

Modified Paths:
--------------
    brlcad/trunk/src/libged/edcodes.c

Modified: brlcad/trunk/src/libged/edcodes.c
===================================================================
--- brlcad/trunk/src/libged/edcodes.c   2012-01-13 17:09:48 UTC (rev 48742)
+++ brlcad/trunk/src/libged/edcodes.c   2012-01-13 17:09:55 UTC (rev 48743)
@@ -149,29 +149,12 @@
     char tmpfil[MAXPATHLEN] = {0};
     const char *editstring = NULL;
 
-    static const char *usage = "[-i|-n|-r] object(s)";
+    static const char *usage = "[-i|-n|-r|-E editor] object(s)";
 
     GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
     GED_CHECK_READ_ONLY(gedp, GED_ERROR);
     GED_CHECK_ARGC_GT_0(gedp, argc, GED_ERROR);
 
-    /* First, grab the editstring off of the argv list */
-
-    bu_optind = 1;
-    /* First, grab the editstring off of the argv list */
-    while ((c = bu_getopt(argc, (char * const *)argv, "E:")) != -1) {
-       switch (c) {
-           case 'E' :
-               editstring = bu_optarg;
-               break;
-           default :
-               break;
-       }
-    }
-
-    argc -= bu_optind - 1;
-    argv += bu_optind - 1;
-
     /* initialize result */
     bu_vls_trunc(gedp->ged_result_str, 0);
 
@@ -182,8 +165,11 @@
     }
 
     bu_optind = 1;
-    while ((c = bu_getopt(argc, (char * const *)argv, "inr")) != -1) {
-       switch(c) {
+    while ((c = bu_getopt(argc, (char * const *)argv, "E:inr")) != -1) {
+       switch (c) {
+           case 'E' :
+               editstring = bu_optarg;
+               break;
            case 'i':
                sort_by_ident = 1;
                break;
@@ -201,8 +187,8 @@
        return GED_ERROR;
     }
 
-    argc -= (bu_optind - 1);
-    argv += (bu_optind - 1);
+    argc -= bu_optind - 1;
+    argv += bu_optind - 1;
 
     if (nflag) {
        struct directory *dp;

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


------------------------------------------------------------------------------
RSA(R) Conference 2012
Mar 27 - Feb 2
Save $400 by Jan. 27
Register now!
http://p.sf.net/sfu/rsa-sfdev2dev2
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits