[brlcad-commits] SF.net SVN: brlcad:[55099] brlcad/trunk/src/conv/stl/g-stl.c

[carlmoore]

Revision: 55099
          http://brlcad.svn.sourceforge.net/brlcad/?rev=55099&view=rev
Author:   carlmoore
Date:     2013-04-09 20:05:02 +0000 (Tue, 09 Apr 2013)
Log Message:
-----------
use 'g-stl:' in error messages, and supply new message about missing .g file 
and object(s)

Modified Paths:
--------------
    brlcad/trunk/src/conv/stl/g-stl.c

Modified: brlcad/trunk/src/conv/stl/g-stl.c
===================================================================
--- brlcad/trunk/src/conv/stl/g-stl.c   2013-04-09 19:56:01 UTC (rev 55098)
+++ brlcad/trunk/src/conv/stl/g-stl.c   2013-04-09 20:05:02 UTC (rev 55099)
@@ -311,6 +311,8 @@
     int i;
     int ret;
     int use_mc = 0;
+    int mutex;
+    int missingg;
 
     bu_setlinebuf(stderr);
 
@@ -395,18 +397,18 @@
        }
     }
 
-    if (bu_optind+1 >= argc) {
+    mutex = (output_file && output_directory);
+    missingg = (bu_optind+1 >= argc);
+    if (mutex)
+       bu_log("g-stl: options \"-o\" and \"-m\" are mutually exclusive\n");
+    if (missingg)
+       bu_log("g-stl: missing .g file and object(s)\n");
+    if (mutex || missingg)
        bu_exit(1, usage, argv[0]);
-    }
 
-    if (output_file && output_directory) {
-       bu_log("ERROR: options \"-o\" and \"-m\" are mutually exclusive\n");
-       bu_exit(1, usage, argv[0]);
-    }
-
     if (!output_file && !output_directory) {
        if (binary) {
-           bu_exit(1, "Can't output binary to stdout\n");
+           bu_exit(1, "g-stl: Can't output binary to stdout\n");
        }
        fp = stdout;
     } else if (output_file) {
@@ -415,14 +417,14 @@
            if ((fp=fopen(output_file, "wb+")) == NULL)
            {
                perror(argv[0]);
-               bu_exit(1, "Cannot open ASCII output file (%s) for writing\n", 
output_file);
+               bu_exit(1, "g-stl: Cannot open ASCII output file (%s) for 
writing\n", output_file);
            }
        } else {
            /* Open binary output file */
            if ((bfd=open(output_file, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 
S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)) < 0)
            {
                perror(argv[0]);
-               bu_exit(1, "Cannot open binary output file (%s) for writing\n", 
output_file);
+               bu_exit(1, "g-stl: Cannot open binary output file (%s) for 
writing\n", output_file);
            }
        }
     }

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


------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits