[Gnash-commit] /srv/bzr/gnash/trunk r11515: Use EXIT_SUCCESS/EXIT_FAILURE consistent

[Markus Gothe]

------------------------------------------------------------
revno: 11515
committer: Markus Gothe <address@hidden>
branch nick: trunk
timestamp: Mon 2009-09-21 04:46:18 +0200
message:
  Use EXIT_SUCCESS/EXIT_FAILURE consistent
modified:
  libbase/IOChannel.h
  utilities/dumpshm.cpp
  utilities/flvdumper.cpp
  utilities/processor.cpp
  utilities/rtmpget.cpp
  utilities/soldumper.cpp

=== modified file 'libbase/IOChannel.h'
--- a/libbase/IOChannel.h       2009-02-28 13:58:15 +0000
+++ b/libbase/IOChannel.h       2009-09-21 02:46:18 +0000
@@ -143,7 +143,7 @@
        /// Write a 32-bit float to a stream in little-endian order.
        //
        /// NOTE: this currently relies on host FP format being the same
-    ///       as the Flash one (presumably IEEE 754).
+       ///       as the Flash one (presumably IEEE 754).
        ///
        /// Throw IOException on error
        ///
@@ -152,7 +152,7 @@
        /// Read a 32-bit float from a little-endian stream.
        //
        /// NOTE: this currently relies on host FP format being the
-    ///       same as the Flash one (presumably IEEE 754).
+       ///       same as the Flash one (presumably IEEE 754).
        ///
        /// Throw IOException on error
        ///

=== modified file 'utilities/dumpshm.cpp'
--- a/utilities/dumpshm.cpp     2009-04-26 12:12:42 +0000
+++ b/utilities/dumpshm.cpp     2009-09-21 02:46:18 +0000
@@ -130,12 +130,12 @@
     for (c = 0; c < argc; c++) {
       if (strcmp("--help", argv[c]) == 0) {
         usage();
-        exit(0);
+        exit(EXIT_SUCCESS);
       }
       if (strcmp("--version", argv[c]) == 0) {
         printf (_("Gnash dumpshm version: %s, Gnash version: %s\n"),
                   DUMPSHM_VERSION, VERSION);
-        exit(0);
+        exit(EXIT_SUCCESS);
       }
     }
  
@@ -176,14 +176,14 @@
     // print the  usage message.
     if (argc < 2) {
         usage();
-        exit(0);
+        exit(EXIT_SUCCESS);
     }
     
 #if defined(USE_SYSV_SHM) && defined(HAVE_IPC_INFO)
     // Just list the shared memory segments
     if (listfiles && sysv) {
        list_lcs();
-        exit(0);
+        exit(EXIT_SUCCESS);
     }
 #endif
     
@@ -200,7 +200,7 @@
            dump_shm(convert, false);
        }
        
-           exit(0);
+           exit(EXIT_SUCCESS);
     }    
     
     if (size == 0) {
@@ -268,7 +268,7 @@
        close(fd);
     }
     
-    exit (0);
+    exit (EXIT_SUCCESS);
 }
 
 #if defined(USE_SYSV_SHM) && defined(HAVE_IPC_INFO)
@@ -347,7 +347,7 @@
     cerr << _("-r\tDump SYSV segments") << endl;
     cerr << _("-c\tDump SYSV segments to disk") << endl;
     cerr << _("-v\tVerbose output") << endl;
-    exit (-1);
+    exit (EXIT_FAILURE);
 }
 
 /// \brief Dumps the internal data of the found ShmControl

=== modified file 'utilities/flvdumper.cpp'
--- a/utilities/flvdumper.cpp   2009-04-26 12:12:42 +0000
+++ b/utilities/flvdumper.cpp   2009-09-21 02:46:18 +0000
@@ -201,7 +201,7 @@
            boost::shared_ptr<Flv::flv_header_t> head = flv.decodeHeader(buf);
            if (head == 0) {
                log_error("Couldn't decode the header! %s",  
hexify(buf->reference(), 9, false));
-               exit(-1);
+               exit(EXIT_FAILURE);
            }
            if ((head->type & Flv::FLV_VIDEO) && (head->type & Flv::FLV_AUDIO)) 
{
                 cout <<"FLV File type: Video and Audio" << endl;

=== modified file 'utilities/processor.cpp'
--- a/utilities/processor.cpp   2009-08-08 02:48:06 +0000
+++ b/utilities/processor.cpp   2009-09-21 02:46:18 +0000
@@ -242,12 +242,12 @@
     for (c = 0; c < argc; c++) {
       if (strcmp("--help", argv[c]) == 0) {
         usage(argv[0]);
-        exit(0);
+        exit(EXIT_SUCCESS);
       }
       if (strcmp("--version", argv[c]) == 0) {
         printf (_("Gnash gprocessor version: %s, Gnash version: %s\n"),
                   GPROC_VERSION, VERSION);
-        exit(0);
+        exit(EXIT_SUCCESS);
       }
     }
  
@@ -281,7 +281,7 @@
          case 'h':
              usage (argv[0]);
               dbglogfile.removeLog();
-             exit(0);
+             exit(EXIT_SUCCESS);
          case 'w':
              s_do_output = true;
              break;
@@ -327,11 +327,11 @@
              break;
          case ':':
               fprintf(stderr, "Missing argument for switch ``%c''\n", optopt); 
-             exit(1);
+             exit(EXIT_FAILURE);
          case '?':
          default:
               fprintf(stderr, "Unknown switch ``%c''\n", optopt); 
-             exit(1);
+             exit(EXIT_FAILURE);
        }
     }
     
@@ -347,7 +347,7 @@
            std::cerr << "no input files" << std::endl;
            usage(argv[0]);
         dbglogfile.removeLog();
-           exit(1);
+           exit(EXIT_FAILURE);
     }
 
     if (infiles.size() > 1)
@@ -356,7 +356,7 @@
         std::cerr << "Multiple input files not supported." << std::endl;
         usage(argv[0]);
         dbglogfile.removeLog();
-        exit(1);
+        exit(EXIT_FAILURE);
     }
 
 
@@ -399,7 +399,7 @@
                if (s_stop_on_errors) {
                    // Fail.
                 std::cerr << "error playing through movie " << *i << std::endl;
-                       std::exit(1);
+                       std::exit(EXIT_FAILURE);
                }
         }
        
@@ -462,7 +462,7 @@
     }
     if (md == NULL) {
         std::cerr << "error: can't play movie: "<< filename << std::endl;
-           std::exit(1);
+           std::exit(EXIT_FAILURE);
     }
 
     float fps = md->get_frame_rate();

=== modified file 'utilities/rtmpget.cpp'
--- a/utilities/rtmpget.cpp     2009-08-05 17:23:14 +0000
+++ b/utilities/rtmpget.cpp     2009-09-21 02:46:18 +0000
@@ -118,7 +118,7 @@
     // print the  usage message.
     if (argc < 2) {
         usage();
-        exit(0);
+        exit(EXIT_SUCCESS);
     }
 
    const Arg_parser::Option opts[] =
@@ -168,10 +168,10 @@
               case 'h':
                   version_and_copyright();
                   usage();
-                  exit(0);
+                  exit(EXIT_SUCCESS);
               case 'V':
                   version_and_copyright();
-                  exit(0);
+                  exit(EXIT_SUCCESS);
               case 'v':
                   dbglogfile.setVerbosity();
                   log_debug (_("Verbose output turned on"));
@@ -196,7 +196,7 @@
                   break;
               case 'd':
                   rcfile.dump();
-                  exit(0);
+                  exit(EXIT_SUCCESS);
                   break;
               case 0:
                   infiles.push_back(parser.argument(i));
@@ -226,7 +226,7 @@
     client.toggleDebug(netdebug);
     if (client.createClient(hostname, port) == false) {
         log_error("Can't connect to RTMP server %s", hostname);
-        exit(-1);
+        exit(EXIT_FAILURE);
     }
     
     if (! client.handShakeRequest()) {
@@ -259,7 +259,7 @@
     
     if (!msg1) {
         log_error("No response from INVOKE of NetConnection connect");
-        exit(-1);
+        exit(EXIT_FAILURE);
     }
 
     msg1->dump();
@@ -267,7 +267,7 @@
         log_debug("Sent NetConnection Connect message sucessfully");
     } else {
         log_error("Couldn't send NetConnection Connect message,");
-        //exit(-1);
+        //exit(EXIT_FAILURE);
     }
 
     // make the createStream for ID 3 encoded object
@@ -280,7 +280,7 @@
 
     if (!msg2) {
         log_error("No response from INVOKE of NetStream::createStream");
-        exit(-1);
+        exit(EXIT_FAILURE);
     }
 
     log_debug("Sent NetStream::createStream message successfully:"); 
msg2->dump();
@@ -291,7 +291,7 @@
     } else {
         if (msg2->getMethodName() == "close") { 
             log_debug("Got close packet!!! Exiting...");
-            exit(0);
+            exit(EXIT_SUCCESS);
         }
         log_error("Got no properties from NetStream::createStream invocation, 
arbitrarily taking 0 as streamID");
         streamID = 0.0;
@@ -312,7 +312,7 @@
             log_debug("Sent NetStream::play message sucessfully.");
         } else {
             log_error("Couldn't send NetStream::play message,");
-//          exit(-1);
+//          exit(EXIT_FAILURE);
         }
     }
 
@@ -321,12 +321,12 @@
         BufferSharedPtr msgs = client.recvMsg(1);   // use a 1 second timeout
         if (msgs == 0) {
             log_error("Never got any data!");
-            exit(-1);
+            exit(EXIT_FAILURE);
         }
         RTMP::queues_t *que = client.split(msgs);
         if (que == 0) {
             log_error("Never got any messages!");
-            exit(-1);
+            exit(EXIT_FAILURE);
         }
 
 #if 0
@@ -391,7 +391,7 @@
     close(fd);
 #endif    
 
-    exit(0);
+    exit(EXIT_SUCCESS);
 }
 
 // Trap Control-C so we can cleanly exit
@@ -400,7 +400,7 @@
 {
     log_debug(_("Got an interrupt"));
 
-    exit(-1);
+    exit(EXIT_FAILURE);
 }
 
 static void

=== modified file 'utilities/soldumper.cpp'
--- a/utilities/soldumper.cpp   2009-08-07 23:24:30 +0000
+++ b/utilities/soldumper.cpp   2009-09-21 02:46:18 +0000
@@ -98,12 +98,12 @@
     for (c = 0; c < argc; c++) {
       if (strcmp("--help", argv[c]) == 0) {
         usage(cout);
-        exit(0);
+        exit(EXIT_SUCCESS);
       }
       if (strcmp("--version", argv[c]) == 0) {
         printf (_("Gnash soldumper version: %s, Gnash version: %s\n"),
                   SOLDUMPER_VERSION, VERSION);
-        exit(0);
+        exit(EXIT_SUCCESS);
       }
     }
  
@@ -112,7 +112,7 @@
         switch (c) {
           case 'h':
             usage(cout);
-           exit(0);
+           exit(EXIT_SUCCESS);
             break;
             
          case 'v':
@@ -141,7 +141,7 @@
     // print the  usage message.
     if (argc < 2) {
         usage(cerr);
-        exit(1);
+        exit(EXIT_FAILURE);
     }
 
     // get the file name from the command line
@@ -182,7 +182,7 @@
                 }
             }
         }
-        exit(0);
+        exit(EXIT_SUCCESS);
     }
     
     string newspec;