diff options
| -rw-r--r-- | src/modules/m_spanningtree.cpp | 8 | ||||
| -rw-r--r-- | src/socket.cpp | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp index ccc5cd6dc..a28ce44cf 100644 --- a/src/modules/m_spanningtree.cpp +++ b/src/modules/m_spanningtree.cpp @@ -1358,8 +1358,10 @@ class TreeSocket : public InspSocket * back to the core so that a large burst is split into at least 6 sections * (possibly more) */ + std::string burst = "BURST"; + std::string endburst = "ENDBURST"; Srv->SendOpers("*** Bursting to \2"+s->GetName()+"\2."); - this->WriteLine("BURST"); + this->WriteLine(burst); ServerInstance->DoOneIteration(false); /* send our version string */ this->WriteLine(":"+Srv->GetServerName()+" VERSION :"+Srv->GetVersion()); @@ -1376,7 +1378,7 @@ class TreeSocket : public InspSocket ServerInstance->DoOneIteration(false); FOREACH_MOD(I_OnSyncOtherMetaData,OnSyncOtherMetaData((Module*)TreeProtocolModule,(void*)this)); ServerInstance->DoOneIteration(false); - this->WriteLine("ENDBURST"); + this->WriteLine(endburst); Srv->SendOpers("*** Finished bursting to \2"+s->GetName()+"\2."); } @@ -2083,7 +2085,7 @@ class TreeSocket : public InspSocket int item = 0; while (!s.eof()) { - char c; + char c = 0; s.get(c); if (c == ' ') { diff --git a/src/socket.cpp b/src/socket.cpp index e240d1208..4c03c933d 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -261,9 +261,9 @@ void InspSocket::FlushWriteBuffer() { if ((this->fd > -1) && (this->state == I_CONNECTED)) { - int result = 0; + int result = 0, v = 0; const char* n = Buffer.c_str(); - int v = Buffer.length(); + v = Buffer.length(); if (v > 0) { result = write(this->fd,n,v); |