From 08ff4e78cf5873a3d243ac16d037ad7705c7ec37 Mon Sep 17 00:00:00 2001
From: "Peter D. Barnes, Jr." <barnes26@llnl.gov>
Date: Thu, 16 Jun 2016 16:11:31 -0700
Subject: [PATCH] [core] Use standard arguments args, argv.

---
 src/core/model/command-line.cc | 10 +++++-----
 src/core/model/test.cc         |  9 +++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/core/model/command-line.cc b/src/core/model/command-line.cc
index d6c852b9f..ba56fdc51 100644
--- a/src/core/model/command-line.cc
+++ b/src/core/model/command-line.cc
@@ -109,17 +109,17 @@ CommandLine::Item::~Item ()
 }
 
 void
-CommandLine::Parse (int iargc, char *argv[])
+CommandLine::Parse (int argc, char *argv[])
 {
-  NS_LOG_FUNCTION (this << iargc << argv);
+  NS_LOG_FUNCTION (this << argc << argv);
 
   m_name = SystemPath::Split (argv[0]).back ();
   
-  int argc = iargc;
-  for (argc--, argv++; argc > 0; argc--, argv++)
+  int iargc = argc;
+  for (iargc--; iargc > 0; iargc--)
     {
       // remove "--" or "-" heading.
-      std::string param = *argv;
+      std::string param = argv[iargc];
       std::string::size_type cur = param.find ("--");
       if (cur == 0)
         {
diff --git a/src/core/model/test.cc b/src/core/model/test.cc
index 01878ae14..23cb4dd0c 100644
--- a/src/core/model/test.cc
+++ b/src/core/model/test.cc
@@ -875,11 +875,12 @@ TestRunnerImpl::Run (int argc, char *argv[])
   enum TestCase::TestDuration maximumTestDuration = TestCase::QUICK;
   char *progname = argv[0];
 
-  argv++;
+  char ** argi = argv;
+  ++argi;
 
-  while (*argv != 0)
+  while (*argi != 0)
     {
-      char *arg = *argv;
+      char *arg = *argi;
 
       if (strcmp(arg, "--assert-on-failure") == 0)
         {
@@ -971,7 +972,7 @@ TestRunnerImpl::Run (int argc, char *argv[])
           PrintHelp (progname);
           return 0;
         }
-      argv++;
+      argi++;
     }
   enum TestSuite::Type testType;
   if (testTypeString == "")