Change PACKAGE to PROGRAM_NAME.

diff --git a/src/asdcp-test.cpp b/src/asdcp-test.cpp
index ba610157d8db5eb3f696d1fa08aedd218c6f2062..c77cd8913d44775955d0574589b887aedc84263c 100755 (executable)
--- a/src/asdcp-test.cpp
+++ b/src/asdcp-test.cpp
@@ -66,7 +66,7 @@ const ui32_t FRAME_BUFFER_SIZE = 4 * Kumu::Megabyte;
 //
 // command line option parser class
 
-static const char* PACKAGE = "asdcp-test";  // program name for messages
+static const char* PROGRAM_NAME = "asdcp-test";  // program name for messages
 const ui32_t MAX_IN_FILES = 16;             // maximum number of input files handled by
                                             //   the command option parser
 
@@ -110,7 +110,7 @@ Copyright (c) 2003-2008 John Hurst\n\n\
 asdcplib may be copied only under the terms of the license found at\n\
 the top of every file in the asdcplib distribution kit.\n\n\
 Specify the -h (help) option for further information about %s\n\n",
-         PACKAGE, ASDCP::Version(), PACKAGE);
+         PROGRAM_NAME, ASDCP::Version(), PROGRAM_NAME);
 }
 
 //
@@ -136,7 +136,7 @@ USAGE: %s -c <output-file> [-3] [-b <buffer-size>] [-d <duration>] [-e|-E]\n\
        %s -x <file-prefix> [-3] [-b <buffer-size>] [-d <duration>]\n\
        [-f <starting-frame>] [-m] [-p <frame-rate>] [-R] [-s <num>] [-S|-1]\n\
        [-v] [-W] <input-file>\n\
-\n", PACKAGE, PACKAGE, PACKAGE, PACKAGE, PACKAGE, PACKAGE, PACKAGE);
+\n", PROGRAM_NAME, PROGRAM_NAME, PROGRAM_NAME, PROGRAM_NAME, PROGRAM_NAME, PROGRAM_NAME, PROGRAM_NAME);
 
   fprintf(stream, "\
 Major modes:\n\
@@ -1769,7 +1769,7 @@ main(int argc, const char** argv)
 
   if ( Options.error_flag )
     {
-      fprintf(stderr, "There was a problem. Type %s -h for help.\n", PACKAGE);
+      fprintf(stderr, "There was a problem. Type %s -h for help.\n", PROGRAM_NAME);
       return 3;
     }
 

diff --git a/src/blackwave.cpp b/src/blackwave.cpp
index 628b51db8abe227511828c06ea9ae92e8dba3ad3..137403898c8450ddec4f7ceec9e4f434687a0777 100644 (file)
--- a/src/blackwave.cpp
+++ b/src/blackwave.cpp
@@ -38,7 +38,7 @@ using namespace ASDCP;
 //
 // command line option parser class
 
-static const char* PACKAGE = "blackwave";    // program name for messages
+static const char* PROGRAM_NAME = "blackwave";    // program name for messages
 
 // Macros used to test command option data state.
 
@@ -61,7 +61,7 @@ wavesplit is part of asdcplib.\n\
 asdcplib may be copied only under the terms of the license found at\n\
 the top of every file in the asdcplib distribution kit.\n\n\
 Specify the -h (help) option for further information about %s\n\n",
-         PACKAGE, ASDCP::Version(), PACKAGE);
+         PROGRAM_NAME, ASDCP::Version(), PROGRAM_NAME);
 }
 
 //
@@ -80,7 +80,7 @@ Other Options:\n\
 \n\
   NOTES: o There is no option grouping, all options must be distinct arguments.\n\
          o All option arguments must be separated from the option by whitespace.\n\
-\n", PACKAGE);
+\n", PROGRAM_NAME);
 }
 
 //

diff --git a/src/klvwalk.cpp b/src/klvwalk.cpp
index 1bf505601e123383233eaf5a909c4ec6c19af5c4..9a815b76ff92423ec73c0858fc4845f7a43ba2cc 100755 (executable)
--- a/src/klvwalk.cpp
+++ b/src/klvwalk.cpp
@@ -47,7 +47,7 @@ using Kumu::DefaultLogSink;
 //
 // command line option parser class
 
-static const char* PACKAGE = "klvwalk";    // program name for messages
+static const char* PROGRAM_NAME = "klvwalk";    // program name for messages
 typedef std::list<std::string> FileList_t;
 
 // Increment the iterator, test for an additional non-option command line argument.
@@ -70,7 +70,7 @@ Copyright (c) 2005-2008 John Hurst\n\
 asdcplib may be copied only under the terms of the license found at\n\
 the top of every file in the asdcplib distribution kit.\n\n\
 Specify the -h (help) option for further information about %s\n\n",
-         PACKAGE, ASDCP::Version(), PACKAGE, PACKAGE);
+         PROGRAM_NAME, ASDCP::Version(), PROGRAM_NAME, PROGRAM_NAME);
 }
 
 //
@@ -89,7 +89,7 @@ USAGE: %s [-r] [-v] <input-file> [<input-file2> ...]\n\
 \n\
   NOTES: o There is no option grouping, all options must be distinct arguments.\n\
          o All option arguments must be separated from the option by whitespace.\n\
-\n", PACKAGE, PACKAGE);
+\n", PROGRAM_NAME, PROGRAM_NAME);
 }
 
 //
@@ -178,7 +178,7 @@ main(int argc, const char** argv)
 
   if ( Options.error_flag )
     {
-      fprintf(stderr, "There was a problem. Type %s -h for help.\n", PACKAGE);
+      fprintf(stderr, "There was a problem. Type %s -h for help.\n", PROGRAM_NAME);
       return 3;
     }
 

diff --git a/src/kmfilegen.cpp b/src/kmfilegen.cpp
index 3f3ba11c4a5c4c3e75014311f2068652364d50bb..487f67ac0132ec25b36e41e01030741d94f346a6 100755 (executable)
--- a/src/kmfilegen.cpp
+++ b/src/kmfilegen.cpp
@@ -40,7 +40,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using namespace Kumu;
 
 // constants
-static const char* PACKAGE = "kmfilegen";  // program name for messages
+static const char* PROGRAM_NAME = "kmfilegen";  // program name for messages
 const ui32_t RNG_KEY_SIZE = 16;
 const ui32_t RNG_KEY_SIZE_BITS = 128;
 const ui32_t RNG_BLOCK_SIZE = 16;
@@ -74,7 +74,7 @@ Copyright (c) 2005-2008 John Hurst\n\
 asdcplib may be copied only under the terms of the license found at\n\
 the top of every file in the asdcplib distribution kit.\n\n\
 Specify the -h (help) option for further information about %s\n\n",
-         PACKAGE, ASDCP::Version(), PACKAGE, PACKAGE);
+         PROGRAM_NAME, ASDCP::Version(), PROGRAM_NAME, PROGRAM_NAME);
 }
 
 
@@ -102,7 +102,7 @@ USAGE: %s [-c <file-size>] [-v] <output-file>\n\
 \n\
   NOTES: o There is no option grouping, all options must be distinct arguments.\n\
          o All option arguments must be separated from the option by whitespace.\n\
-\n", PACKAGE, PACKAGE, PACKAGE, PACKAGE);
+\n", PROGRAM_NAME, PROGRAM_NAME, PROGRAM_NAME, PROGRAM_NAME);
 }
 
 enum MajorMode_t {
@@ -574,7 +574,7 @@ main(int argc, const char **argv)
 
   if ( Options.error_flag )
     {
-      fprintf(stderr, "There was a problem. Type %s -h for help.\n", PACKAGE);
+      fprintf(stderr, "There was a problem. Type %s -h for help.\n", PROGRAM_NAME);
       return 3;
     }
 

diff --git a/src/kmrandgen.cpp b/src/kmrandgen.cpp
index 84f1a3d587109e57b130f5d2098588c675ff1226..d1098df21c0bbbbead2055ecbc01dba1a1d715d8 100644 (file)
--- a/src/kmrandgen.cpp
+++ b/src/kmrandgen.cpp
@@ -37,7 +37,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using namespace Kumu;
 
 const ui32_t RandBlockSize = 16;
-const char* PACKAGE = "kmrandgen";
+const char* PROGRAM_NAME = "kmrandgen";
 
 // Increment the iterator, test for an additional non-option command line argument.
 // Causes the caller to return if there are no remaining arguments or if the next
@@ -59,7 +59,7 @@ Copyright (c) 2003-2008 John Hurst\n\n\
 asdcplib may be copied only under the terms of the license found at\n\
 the top of every file in the asdcplib distribution kit.\n\n\
 Specify the -h (help) option for further information about %s\n\n",
-         PACKAGE, ASDCP::Version(), PACKAGE, PACKAGE);
+         PROGRAM_NAME, ASDCP::Version(), PROGRAM_NAME, PROGRAM_NAME);
 }
 
 //
@@ -83,7 +83,7 @@ USAGE: %s [-b|-B|-c|-x] [-n] [-s <size>] [-v]\n\
 \n\
   NOTES: o There is no option grouping, all options must be distinct arguments.\n\
          o All option arguments must be separated from the option by whitespace.\n\
-\n", PACKAGE, PACKAGE);
+\n", PROGRAM_NAME, PROGRAM_NAME);
 }
 
 enum OutputFormat_t {
@@ -183,7 +183,7 @@ main(int argc, const char** argv)
 
   if ( Options.error_flag )
     {
-      fprintf(stderr, "There was a problem. Type %s -h for help.\n", PACKAGE);
+      fprintf(stderr, "There was a problem. Type %s -h for help.\n", PROGRAM_NAME);
       return 3;
     }
 

diff --git a/src/kmuuidgen.cpp b/src/kmuuidgen.cpp
index 1dfdf243afdc14501f560ee1d4a8a229d64ed380..a7bfc42be8e91a6ac0dfa8eeadcb6a542479ff8b 100644 (file)
--- a/src/kmuuidgen.cpp
+++ b/src/kmuuidgen.cpp
@@ -34,7 +34,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <ctype.h>
 
 
-const char* PACKAGE = "kmuuidgen";
+const char* PROGRAM_NAME = "kmuuidgen";
 
 // Increment the iterator, test for an additional non-option command line argument.
 // Causes the caller to return if there are no remaining arguments or if the next
@@ -56,7 +56,7 @@ Copyright (c) 2003-2008 John Hurst\n\n\
 asdcplib may be copied only under the terms of the license found at\n\
 the top of every file in the asdcplib distribution kit.\n\n\
 Specify the -h (help) option for further information about %s\n\n",
-         PACKAGE, ASDCP::Version(), PACKAGE, PACKAGE);
+         PROGRAM_NAME, ASDCP::Version(), PROGRAM_NAME, PROGRAM_NAME);
 }
 
 //
@@ -76,7 +76,7 @@ USAGE: %s [-c] [-n] [-v]\n\
 \n\
   NOTES: o There is no option grouping, all options must be distinct arguments.\n\
          o All option arguments must be separated from the option by whitespace.\n\
-\n", PACKAGE, PACKAGE);
+\n", PROGRAM_NAME, PROGRAM_NAME);
 }
 
 //
@@ -154,7 +154,7 @@ main(int argc, const char** argv)
 
   if ( Options.error_flag )
     {
-      fprintf(stderr, "There was a problem. Type %s -h for help.\n", PACKAGE);
+      fprintf(stderr, "There was a problem. Type %s -h for help.\n", PROGRAM_NAME);
       return 3;
     }
 

diff --git a/src/wavesplit.cpp b/src/wavesplit.cpp
index f7c94c269d0c48366de0d76ca0a3b824df490e52..6836d2350657d40b20866366a277d4014a0186d5 100755 (executable)
--- a/src/wavesplit.cpp
+++ b/src/wavesplit.cpp
@@ -39,7 +39,7 @@ using namespace ASDCP;
 //
 // command line option parser class
 
-static const char* PACKAGE = "wavesplit";    // program name for messages
+static const char* PROGRAM_NAME = "wavesplit";    // program name for messages
 
 // Macros used to test command option data state.
 
@@ -74,7 +74,7 @@ wavesplit is part of asdcplib.\n\
 asdcplib may be copied only under the terms of the license found at\n\
 the top of every file in the asdcplib distribution kit.\n\n\
 Specify the -h (help) option for further information about %s\n\n",
-         PACKAGE, ASDCP::Version(), PACKAGE);
+         PROGRAM_NAME, ASDCP::Version(), PROGRAM_NAME);
 }
 
 //
@@ -96,7 +96,7 @@ Read/Write Options:\n\
 \n\
   NOTES: o There is no option grouping, all options must be distinct arguments.\n\
          o All option arguments must be separated from the option by whitespace.\n\
-\n", PACKAGE);
+\n", PROGRAM_NAME);
 }
 
 //