[brlcad-commits] SF.net SVN: brlcad:[41397] brlcad/trunk/src/fb/fbstretch.c

[brlcad]

Revision: 41397
          http://brlcad.svn.sourceforge.net/brlcad/?rev=41397&view=rev
Author:   brlcad
Date:     2010-11-17 21:43:05 +0000 (Wed, 17 Nov 2010)

Log Message:
-----------
rewire so it's not calling VMessage() directly

Modified Paths:
--------------
    brlcad/trunk/src/fb/fbstretch.c

Modified: brlcad/trunk/src/fb/fbstretch.c
===================================================================
--- brlcad/trunk/src/fb/fbstretch.c     2010-11-17 21:31:15 UTC (rev 41396)
+++ brlcad/trunk/src/fb/fbstretch.c     2010-11-17 21:43:05 UTC (rev 41397)
@@ -117,18 +117,12 @@
 
 /* in ioutil.c */
 extern void Message(const char *format, ...);
-extern void VMessage(const char *format, va_list ap);
+extern void Fatal( FBIO *fbiop, const char *format, ... );
 
 
 static void
-Stretch_Fatal(const char *format, ...)
+Stretch_Fatal(const char *str)
 {
-    va_list            ap;
-    
-    va_start(ap, format);
-    VMessage(format, ap);
-    va_end(ap);
-    
     if (src_fbp != FBIO_NULL && fb_close(src_fbp) == -1) {
        Message("Error closing input frame buffer");
        src_fbp = FBIO_NULL;
@@ -139,7 +133,7 @@
        src_fbp = FBIO_NULL;
     }
 
-    bu_exit(EXIT_FAILURE, NULL);
+    Fatal(FBIO_NULL, "%s", str);
     /* NOT REACHED */
 }
 
@@ -149,8 +143,7 @@
 {
     (void)signal(sig, SIG_DFL);
 
-    /* The following is not guaranteed to work, but it's worth a try. */
-    Stretch_Fatal("Interrupted by signal %d", sig);
+    bu_exit(EXIT_FAILURE, "Interrupted by signal %d\n", sig);
 }
 
 
@@ -277,14 +270,14 @@
            }
 
        if (errors)
-           Stretch_Fatal("Usage: %s\n%s\n%s", USAGE1, USAGE2, USAGE3);
+           bu_exit(1, "Usage: %s\n%s\n%s\n", USAGE1, USAGE2, USAGE3);
     }
 
     if (bu_optind < argc)              /* dst_file */
     {
        if (bu_optind < argc - 1 || dst_file != NULL)
        {
-           Message("Usage: %s\n%s\n%s", USAGE1, USAGE2, USAGE3);
+           bu_log("Usage: %s\n%s\n%s", USAGE1, USAGE2, USAGE3);
            Stretch_Fatal("Can't handle multiple output frame buffers!");
        }
 
@@ -850,7 +843,7 @@
     if (dst_fbp != src_fbp && fb_close(dst_fbp) == -1)
        Message("Error closing output frame buffer");
 
-    bu_exit(EXIT_SUCCESS, NULL);
+    return 0;
 }
 
 /*


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

------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1,  ECMAScript5, and DOM L2 & L3.
Spend less time writing and  rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits