git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added separate touch time for traffcounter packet processor.
[stg.git]
/
projects
/
stargazer
/
plugins
/
configuration
/
sgconfig
/
configproto.cpp
diff --git
a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
index 7ca37b49fb95a9c75302465d5658cdb31c26cf84..22facc612adf4b55a9b02f22d3f3ac8d20a323c2 100644
(file)
--- a/
projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
+++ b/
projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
@@
-158,10
+158,9
@@
XML_ParserFree(xmlParser);
//-----------------------------------------------------------------------------
int CONFIGPROTO::ParseCommand()
{
//-----------------------------------------------------------------------------
int CONFIGPROTO::ParseCommand()
{
-
list<
string>::iterator n;
+
std::list<std::
string>::iterator n;
int done = 0;
char str[9];
int done = 0;
char str[9];
-int len;
if (requestList.empty())
return 0;
if (requestList.empty())
return 0;
@@
-179,14
+178,14
@@
while(nonstop)
{
strncpy(str, (*n).c_str(), 8);
str[8] = 0;
{
strncpy(str, (*n).c_str(), 8);
str[8] = 0;
- len = strlen(str);
+
size_t
len = strlen(str);
++n;
if (n == requestList.end())
done = 1;
--n;
++n;
if (n == requestList.end())
done = 1;
--n;
- if (XML_Parse(xmlParser, (*n).c_str(),
len
, done) == XML_STATUS_ERROR)
+ if (XML_Parse(xmlParser, (*n).c_str(),
static_cast<int>(len)
, done) == XML_STATUS_ERROR)
{
logger("Invalid configuration request");
printfd(__FILE__, "Parse error at line %d:\n%s\n",
{
logger("Invalid configuration request");
printfd(__FILE__, "Parse error at line %d:\n%s\n",