git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build on Darwin.
[stg.git]
/
projects
/
stargazer
/
plugins
/
other
/
rscript
/
nrmap_parser.cpp
diff --git
a/projects/stargazer/plugins/other/rscript/nrmap_parser.cpp
b/projects/stargazer/plugins/other/rscript/nrmap_parser.cpp
index 38caa1cfe2febd5f7422eee208c1d25a53899b7c..308d5d0532a9349ced0a8e82051569ec79299862 100644
(file)
--- a/
projects/stargazer/plugins/other/rscript/nrmap_parser.cpp
+++ b/
projects/stargazer/plugins/other/rscript/nrmap_parser.cpp
@@
-31,18
+31,10
@@
#include <sys/types.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <arpa/inet.h>
-#include "common.h"
+#include "stg/common.h"
#include "nrmap_parser.h"
#include "nrmap_parser.h"
-NRMapParser::NRMapParser()
-{
-}
-
-NRMapParser::~NRMapParser()
-{
-}
-
bool NRMapParser::ReadFile(const std::string & fileName)
{
std::ifstream source(fileName.c_str());
bool NRMapParser::ReadFile(const std::string & fileName)
{
std::ifstream source(fileName.c_str());
@@
-96,8
+88,8
@@
if (pos == std::string::npos)
std::string subnet(line.substr(0, pos)); // xxx.xxx.xxx.xxx/yy
std::string subnet(line.substr(0, pos)); // xxx.xxx.xxx.xxx/yy
-uint32_t ip;
-uint32_t mask;
+uint32_t ip
= 0
;
+uint32_t mask
= 0
;
if (ParseNet(subnet, ip, mask))
{
if (ParseNet(subnet, ip, mask))
{