Copy asdcplib 2.5.11 into the tree.

1 files changed, 11 insertions, 10 deletions

diff --git a/asdcplib/src/kmfilegen.cpp b/asdcplib/src/kmfilegen.cpp
index fb4360ea..989030d0 100755
--- a/asdcplib/src/kmfilegen.cpp
+++ b/asdcplib/src/kmfilegen.cpp
@@ -25,7 +25,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 /*! \file    kmfilegen.cpp
-    \version $Id: kmfilegen.cpp,v 1.8 2009/03/04 17:52:45 jhurst Exp $
+    \version $Id: kmfilegen.cpp,v 1.10 2015/10/16 16:55:33 jhurst Exp $
     \brief   large file test program
 */
 
@@ -123,15 +123,16 @@ public:
   bool   verbose_flag;   // true if the verbose option was selected
   bool   version_flag;   // true if the version display option was selected
   bool   help_flag;      // true if the help display option was selected
-  const char* filename;  // filename to be processed
-  const char* write_filename;  // filename to write with val_write_flag
+  std::string filename;  // filename to be processed
+  std::string write_filename;  // filename to write with val_write_flag
   ui32_t chunk_count;
   MajorMode_t mode;      // MajorMode selector
 
   //
   CommandOptions(int argc, const char** argv) :
-    error_flag(true), order(""), verbose_flag(false), version_flag(false), help_flag(false),
-    filename(""), write_filename(""), chunk_count(0), mode(MMT_VALIDATE)
+    error_flag(true), order(""), verbose_flag(false),
+    version_flag(false), help_flag(false),
+    chunk_count(0), mode(MMT_VALIDATE)
   {
     //    order = "rand";
 
@@ -151,7 +152,7 @@ public:
 	      case 'c':
 		mode = MMT_CREATE;
 		TEST_EXTRA_ARG(i, 'c');
-		chunk_count = atoi(argv[i]);
+		chunk_count = Kumu::xabs(strtol(argv[i], 0, 10));
 		break;
 		
 	      case 'V': version_flag = true; break;
@@ -187,7 +188,7 @@ public:
 	  {
 	    if (argv[i][0] != '-' )
 	      {
-		if ( filename != "" )
+		if ( ! filename.empty() )
 		  {
 		    fprintf(stderr, "Extra filename found: %s\n", argv[i]);
 		    return;
@@ -206,7 +207,7 @@ public:
     if ( help_flag || version_flag )
       return;
     
-    if ( strlen ( filename ) == 0 )
+    if ( filename.empty() )
       {
 	fprintf(stderr, "Filename required.\n");
 	return;
@@ -221,7 +222,7 @@ public:
       if ( strcmp(order, "") == 0 )
 	order = "rand";
 
-    if ( strcmp ( filename, write_filename ) == 0 )
+    if ( filename == write_filename )
       {
 	fprintf(stderr, "Output and input files must be different.\n");
 	return;
@@ -382,7 +383,7 @@ randomize_list(read_list_t* read_list, ui32_t check_total)
 Result_t
 ReadValidateWriteLargeFile(CommandOptions& Options)
 {
-  assert(Options.write_filename);
+  assert(!Options.write_filename.empty());
   ui32_t  check_total = 0;
   ui32_t  write_total = 0;
   ui32_t  read_count = 0;