# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: file:///home/stefano/src/gnash/trunk/
# testament_sha1: 3f0f982f27a72a6f18a485ae6b598f9828fb24f1
# timestamp: 2009-08-08 11:14:06 +0200
# base_revision_id: address@hidden
#   r6srktncqf3ii0pr
# 
# Begin patch
=== modified file 'utilities/soldumper.cpp'
--- utilities/soldumper.cpp	2009-04-26 12:12:42 +0000
+++ utilities/soldumper.cpp	2009-08-07 23:24:30 +0000
@@ -63,7 +63,18 @@
 #endif
 
 const char *SOLDUMPER_VERSION = "0.5";
-static void usage ();
+
+/// \brief  Display the command line arguments
+static void
+usage(ostream &o)
+{
+    o << _("This program dumps the internal data of a .sol file")
+         << endl;
+    o << _("Usage: soldumper [h] filename") << endl;
+    o << _("-h\tHelp") << endl;
+    o << _("-f\tForce local directory access") << endl;
+    o << _("-l\tList all .sol files in default dir") << endl;
+}
 
 int
 main(int argc, char *argv[])
@@ -86,7 +97,7 @@
     // scan for the two main standard GNU options
     for (c = 0; c < argc; c++) {
       if (strcmp("--help", argv[c]) == 0) {
-        usage();
+        usage(cout);
         exit(0);
       }
       if (strcmp("--version", argv[c]) == 0) {
@@ -100,7 +111,8 @@
     while ((c = getopt (argc, argv, "hvfl")) != -1) {
         switch (c) {
           case 'h':
-            usage ();
+            usage(cout);
+	    exit(0);
             break;
             
 	  case 'v':
@@ -119,7 +131,7 @@
 	      break;
 
           default:
-            usage ();
+            usage(cerr);
             break;
         }
     }
@@ -128,8 +140,8 @@
     // If no command line arguments have been supplied, do nothing but
     // print the  usage message.
     if (argc < 2) {
-        usage();
-        exit(0);
+        usage(cerr);
+        exit(1);
     }
 
     // get the file name from the command line
@@ -193,19 +205,6 @@
     sol.dump();
 }
 
-/// \brief  Display the command line arguments
-static void
-usage ()
-{
-    cerr << _("This program dumps the internal data of a .sol file")
-         << endl;
-    cerr << _("Usage: soldumper [h] filename") << endl;
-    cerr << _("-h\tHelp") << endl;
-    cerr << _("-f\tForce local directory access") << endl;
-    cerr << _("-l\tList all .sol files in default dir") << endl;
-    exit (-1);
-}
-
 // Local Variables:
 // mode: C++
 // indent-tabs-mode: t

# Begin bundle
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
fFPG+Kx9oncJv+0a7hvSu3KP/F3JFOFCQ6enmDA=