F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes according to MR 93 feedback

Browse Source 
-- Added GPL license to config-store-load.cc example
-- Enclosed all if-condition code in braces
-- Changed ASSERT checks on inputs in raw-text-config.cc to ABORT checks
This commit is contained in:
Jared Dulmage
2019-09-23 13:12:51 -06:00
committed by Tom Henderson
parent 416457f0a5
commit a8c8965d4d
2 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/config-store/examples/config-store-load.cc
View File

@@ -1,4 +1,22 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2019, WPL Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation;
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Author: Jared Dulmage <jared.dulmage@wpli.net>
*/
#include "ns3/core-module.h"
#include "ns3/config-store-module.h"
#include "ns3/type-id.h"

29
src/config-store/model/raw-text-config.cc
View File

@@ -145,8 +145,8 @@ RawTextConfigLoad::Strip (std::string value)
NS_LOG_FUNCTION (this << value);
std::string::size_type start = value.find ("\"");
std::string::size_type end = value.find ("\"", 1);
NS_ASSERT_MSG (start == 0, "Ill-formed attribute value: " << value);
NS_ASSERT_MSG (end == value.size () - 1, "Ill-formed attribute value: " << value);
NS_ABORT_MSG_IF (start == 0, "Ill-formed attribute value: " << value);
NS_ABORT_MSG_IF (end == value.size () - 1, "Ill-formed attribute value: " << value);
return value.substr (start+1, end-start-1);
}
@@ -164,7 +164,9 @@ RawTextConfigLoad::Default (void)
NS_LOG_DEBUG ("type=" << type << ", name=" << name << ", value=" << value);
value = Strip (value);
if (type == "default")
Config::SetDefault (name, StringValue (value));
{
Config::SetDefault (name, StringValue (value));
}
name.clear ();
type.clear ();
}
@@ -178,12 +180,17 @@ RawTextConfigLoad::Global (void)
std::string type, name, value;
for (std::string line; std::getline (*m_is, line);)
{
if (!ParseLine (line, type, name, value)) continue; // comment
if (!ParseLine (line, type, name, value))
{
continue; // comment
}
NS_LOG_DEBUG ("type=" << type << ", name=" << name << ", value=" << value);
value = Strip (value);
if (type == "global")
Config::SetGlobal (name, StringValue (value));
{
Config::SetGlobal (name, StringValue (value));
}
name.clear ();
type.clear ();
}
@@ -202,7 +209,9 @@ RawTextConfigLoad::Attributes (void)
NS_LOG_DEBUG ("type=" << type << ", name=" << name << ", value=" << value);
value = Strip (value);
if (type == "value")
Config::Set (name, StringValue (value));
{
Config::Set (name, StringValue (value));
}
name.clear ();
type.clear ();
}
@@ -218,11 +227,15 @@ RawTextConfigLoad::ParseLine (const std::string &line, std::string &type, std::s
std::istringstream iss (line);
iss >> std::ws; // remove all blanks line
if (!iss.good ()) // eofbit set if no non-blanks
return false;
{
return false;
}
}
if (line.front () == '#')
return false; // comment line
{
return false; // comment line
}
// for multiline values, append line to value if type and name not empty
if (type.empty () && name.empty ())