retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed a few errors exposed by -Wunused-but-set-variable. 

Removed some leftover variables exposed by same new compiler check.


git-svn-id: http://yate.null.ro/svn/yate/trunk@4589 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2011-09-08 10:36:32 +00:00
parent c731cfacf5
commit 8c230e1d21
5 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/ClientLogic.cpp
View File

@ -4630,7 +4630,7 @@ bool DefaultLogic::toggle(Window* wnd, const String& name, bool active)
value = !active; value = !active;
} }
if (*param) if (*param)
p.addParam(param,String::boolText(active)); p.addParam(param,String::boolText(value));
} }
TelEngine::destruct(obj); TelEngine::destruct(obj);
return Client::self()->setParams(&p); return Client::self()->setParams(&p);
@ -5377,7 +5377,7 @@ bool DefaultLogic::updateContact(const NamedList& params, bool save, bool update
} }
// Notify server if this is a client account (stored on server) // Notify server if this is a client account (stored on server)
// TODO: implement // TODO: implement
return true; return ok;
} }
// Called when the user wants to save contact data // Called when the user wants to save contact data

2
libs/yjabber/session.cpp
View File

@ -1323,7 +1323,6 @@ bool JGSession::sendStanza(XmlElement* stanza, String* stanzaId, bool confirmati
} }
DDebug(m_engine,DebugAll,"Call(%s). Sending stanza (%p,'%s') id=%s [%p]", DDebug(m_engine,DebugAll,"Call(%s). Sending stanza (%p,'%s') id=%s [%p]",
m_sid.c_str(),stanza,stanza->tag(),String::boolText(stanzaId != 0),this); m_sid.c_str(),stanza,stanza->tag(),String::boolText(stanzaId != 0),this);
const char* senderId = m_localSid;
// Check if the stanza should be added to the list of stanzas requiring confirmation // Check if the stanza should be added to the list of stanzas requiring confirmation
if (confirmation && XMPPUtils::isUnprefTag(*stanza,XmlTag::Iq)) { if (confirmation && XMPPUtils::isUnprefTag(*stanza,XmlTag::Iq)) {
String id = m_localSid; String id = m_localSid;
@ -1331,7 +1330,6 @@ bool JGSession::sendStanza(XmlElement* stanza, String* stanzaId, bool confirmati
JGSentStanza* sent = new JGSentStanza(id, JGSentStanza* sent = new JGSentStanza(id,
m_engine->stanzaTimeout() + Time::msecNow(),stanzaId != 0,ping); m_engine->stanzaTimeout() + Time::msecNow(),stanzaId != 0,ping);
stanza->setAttribute("id",*sent); stanza->setAttribute("id",*sent);
senderId = *sent;
if (stanzaId) if (stanzaId)
*stanzaId = *sent; *stanzaId = *sent;
m_sentStanza.append(sent); m_sentStanza.append(sent);

2
modules/client/jabberclient.cpp
View File

@ -1317,7 +1317,7 @@ bool YJBEngine::handleMsgExecute(Message& msg, const String& line)
TelEngine::destruct(xml); TelEngine::destruct(xml);
} }
TelEngine::destruct(s); TelEngine::destruct(s);
return true; return ok;
} }
// Process 'user.login' messages // Process 'user.login' messages

2
modules/server/analog.cpp
View File

@ -2196,13 +2196,11 @@ AnalogCallRec::AnalogCallRec(ModuleLine* line, bool fxsCaller, const char* id)
m_address = m_line->address(); m_address = m_line->address();
// Set caller/called // Set caller/called
ModuleLine* info = m_line;
if (fxsCaller) { if (fxsCaller) {
if (m_startOnSecondRing && fxo->callSetup() == AnalogLine::Before) if (m_startOnSecondRing && fxo->callSetup() == AnalogLine::Before)
fxo->setCall(fxo->caller(),"",m_line->called()); fxo->setCall(fxo->caller(),"",m_line->called());
else else
fxo->setCall(s_unk,"",m_line->called()); fxo->setCall(s_unk,"",m_line->called());
info = fxo;
} }
else else
m_line->setCall(s_unk,"",fxo->called()); m_line->setCall(s_unk,"",fxo->called());

2
modules/ysipchan.cpp
View File

@ -7339,7 +7339,6 @@ SIPDriver::~SIPDriver()
void SIPDriver::initialize() void SIPDriver::initialize()
{ {
static bool first = true;
Output("Initializing module SIP Channel"); Output("Initializing module SIP Channel");
s_cfg = Engine::configFile("ysipchan"); s_cfg = Engine::configFile("ysipchan");
s_cfg.load(); s_cfg.load();
@ -7455,7 +7454,6 @@ void SIPDriver::initialize()
m_endpoint->initializing(false); m_endpoint->initializing(false);
// Everything set: update default udp transport // Everything set: update default udp transport
m_endpoint->updateDefUdpTransport(); m_endpoint->updateDefUdpTransport();
first = false;
} }
void SIPDriver::genUpdate(Message& msg) void SIPDriver::genUpdate(Message& msg)