[Sipp-commits] SF.net SVN: sipp:[581] sipp/trunk/sipp.cpp

[<sri...@us...>]

Revision: 581
          http://sipp.svn.sourceforge.net/sipp/?rev=581&view=rev
Author:   srivanuj
Date:     2009-04-16 04:25:38 +0000 (Thu, 16 Apr 2009)

Log Message:
-----------
Fix: Removing .xml from logs and stats files, provided by Mikael Rudholm

Modified Paths:
--------------
    sipp/trunk/sipp.cpp

Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp	2009-04-16 04:07:17 UTC (rev 580)
+++ sipp/trunk/sipp.cpp	2009-04-16 04:25:38 UTC (rev 581)
@@ -4468,11 +4468,12 @@
 	  if (!strcmp(argv[argi - 1], "-sf")) {
 	    scenario_file = new char [strlen(argv[argi])+1] ;
 	    sprintf(scenario_file,"%s", argv[argi]);
+	    scenario_file = remove_pattern (scenario_file, (char*)".xml");
 	    if (useLogf == 1) {
 	      rotate_logfile();
 	    }
 	    main_scenario = new scenario(argv[argi], 0);
-	    main_scenario->stats->setFileName(argv[argi], (char*)".csv");
+	    main_scenario->stats->setFileName(scenario_file, (char*)".csv");
 	  } else if (!strcmp(argv[argi - 1], "-sn")) {
 	    int i = find_scenario(argv[argi]);
 
@@ -4720,8 +4721,6 @@
   if (scenario_file == NULL) {
     scenario_file = new char [ 5 ] ;
     sprintf(scenario_file, "%s", "sipp");
-  } else {
-    scenario_file = remove_pattern (scenario_file, (char*)".xml");
   }
 
    screen_init(print_last_stats);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.