[Nsnam-commits] ns-2/bin getrc, 1.10, 1.11 raw2gp, 1.7, 1.8 raw2xg, 1.33, 1.34 raw2xg-sctp, 1.2, 1.3

[Tom H. <tom...@us...>]

Update of /cvsroot/nsnam/ns-2/bin
In directory vz-cvs-3.sog:/tmp/cvs-serv17458

Modified Files:
	getrc raw2gp raw2xg raw2xg-sctp 
Log Message:
remove deprecated getopts.pl for Getopt::Std

Index: raw2xg-sctp
===================================================================
RCS file: /cvsroot/nsnam/ns-2/bin/raw2xg-sctp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** raw2xg-sctp	16 Nov 2009 05:51:27 -0000	1.2
--- raw2xg-sctp	4 May 2012 16:16:55 -0000	1.3
***************
*** 2,5 ****
--- 2,6 ----
      if 0;
  
+ package Getopt::Std;
  require 5.001;
  
***************
*** 27,32 ****
  $usage = "usage: $progname [-a] [trace files...]\n";
  
! require 'getopts.pl';
! &Getopts('aAfFs:m:n:qt:') || usage;
  
  $c = 0;
--- 28,33 ----
  $usage = "usage: $progname [-a] [trace files...]\n";
  
! use Getopt::Std;
! getopts('aAfFs:m:n:qt:') || usage;
  
  $c = 0;

Index: getrc
===================================================================
RCS file: /cvsroot/nsnam/ns-2/bin/getrc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** getrc	18 Jul 2001 22:42:44 -0000	1.10
--- getrc	4 May 2012 16:16:55 -0000	1.11
***************
*** 2,5 ****
--- 2,6 ----
  	if 0;
  
+ package Getopt::Std;
  require 5.001;
  
***************
*** 29,35 ****
  
  use Getopt::Std;
- #require 'getopts.pl';
  (getopts('bo:s:d:ef:') && $opt_s != -1) || usage;
- #(&Getopts('bo:s:d:ef:') && $opt_s != -1) || usage;
  
  open(STDOUT, ">$opt_o") if ($opt_o);
--- 30,34 ----

Index: raw2xg
===================================================================
RCS file: /cvsroot/nsnam/ns-2/bin/raw2xg,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** raw2xg	18 Mar 2006 05:40:11 -0000	1.33
--- raw2xg	4 May 2012 16:16:55 -0000	1.34
***************
*** 2,5 ****
--- 2,6 ----
      if 0;
  
+ package Getopt::Std;
  require 5.001;
  
***************
*** 35,40 ****
  $usage = "usage: $progname [-a] [trace files...]\n";
  
! require 'getopts.pl';
! &Getopts('acefgds:m:n:qrplvt:xy') || usage;
  
  $c = 0;
--- 36,41 ----
  $usage = "usage: $progname [-a] [trace files...]\n";
  
! use Getopt::Std;
! getopts('acefgds:m:n:qrplvt:xy') || usage;
  
  $c = 0;

Index: raw2gp
===================================================================
RCS file: /cvsroot/nsnam/ns-2/bin/raw2gp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** raw2gp	25 Aug 2003 23:07:15 -0000	1.7
--- raw2gp	4 May 2012 16:16:55 -0000	1.8
***************
*** 2,5 ****
--- 2,6 ----
  	if 0;
  
+ package Getopt::Std;
  require 5.001;
  
***************
*** 22,27 ****
  };
  
! require 'getopts.pl';
! &Getopts('ags:m:ql') || usage;
  
  # calculate offsets.  Do we need this?
--- 23,28 ----
  };
  
! use Getopt::Std;
! getopts('ags:m:ql') || usage;
  
  # calculate offsets.  Do we need this?