Merge pull request #25 from remia/fix/non-pod-variadic-warning

[asdcplib.git] / src / kmuuidgen.cpp

diff --git a/src/kmuuidgen.cpp b/src/kmuuidgen.cpp
index 1dfdf243afdc14501f560ee1d4a8a229d64ed380..b8e4a2a18a038fe9e95618c5ee15fb6d5788a06e 100644 (file)
--- a/src/kmuuidgen.cpp
+++ b/src/kmuuidgen.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2005-2008, John Hurst
+Copyright (c) 2005-2009, John Hurst
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -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
@@ -51,12 +51,12 @@ banner(FILE* stream = stdout)
 {
   fprintf(stream, "\n\
 %s (asdcplib %s)\n\n\
-Copyright (c) 2003-2008 John Hurst\n\n\
+Copyright (c) 2003-2009 John Hurst\n\n\
 %s is part of the asdcp DCP tools package.\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, Kumu::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;
     }
 
@@ -167,7 +167,7 @@ main(int argc, const char** argv)
       const byte_t* p = UUID.Value();
 
       printf("\
-byte_t uuid_buf[] = {\n\
+byte_t uuid_buf[16] = {\n\
   // %s\n ",
             UUID.EncodeHex(uuid_buf, 40));