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

NetAnim: linkFound variable set but unused

Browse Source
This commit is contained in:
John Abraham
2012-07-29 06:27:08 -07:00
parent 4228f2cf7a
commit d620c6817c
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/netanim/model/animation-interface.cc
View File

@@ -1530,24 +1530,12 @@ std::string AnimationInterface::GetXMLOpenClose_node (uint32_t lp, uint32_t id,
std::string AnimationInterface::GetXMLOpenClose_linkupdate (uint32_t fromId, uint32_t toId, std::string linkDescription)
{
bool linkFound = false;
std::ostringstream oss;
oss << "<linkupdate t=\"" << Simulator::Now ().GetSeconds () << "\""
<< " fromId=\"" << fromId
<< "\" toId=\"" << toId
<< "\" ";
P2pLinkNodeIdPair p1 = { fromId, toId };
P2pLinkNodeIdPair p2 = { toId, fromId };
if (linkProperties.find (p1) != linkProperties.end())
{
linkFound = true;
}
else if (linkProperties.find (p2) != linkProperties.end())
{
linkFound = true;
}
oss << " ld=\"" << linkDescription << "\""
<< " />\n";
return oss.str ();

14
src/netanim/model/animation-interface.h
View File

@@ -291,7 +291,6 @@ public:
std::string linkDescription);
/**
* \brief Is AnimationInterface started
* \returns true if AnimationInterface was started
@@ -477,14 +476,15 @@ private:
std::string GetPacketMetadata (Ptr<const Packet> p);
std::string GetXMLOpen_anim (uint32_t lp);
std::string GetXMLOpen_topology (double minX,double minY,double maxX,double maxY);
std::string GetXMLOpenClose_node (uint32_t lp,uint32_t id,double locX,double locY);
std::string GetXMLOpenClose_node (uint32_t lp,uint32_t id,double locX,double locY, struct Rgb rgb);
std::string GetXMLOpenClose_link (uint32_t fromLp,uint32_t fromId, uint32_t toLp, uint32_t toId);
std::string GetXMLOpen_topology (double minX, double minY, double maxX, double maxY);
std::string GetXMLOpenClose_node (uint32_t lp, uint32_t id, double locX, double locY);
std::string GetXMLOpenClose_node (uint32_t lp, uint32_t id, double locX, double locY, struct Rgb rgb);
std::string GetXMLOpenClose_nodeupdate (uint32_t id, std::string description, struct Rgb rgb);
std::string GetXMLOpenClose_link (uint32_t fromLp, uint32_t fromId, uint32_t toLp, uint32_t toId);
std::string GetXMLOpenClose_linkupdate (uint32_t fromId, uint32_t toId, std::string);
std::string GetXMLOpen_packet (uint32_t fromLp,uint32_t fromId, double fbTx, double lbTx, std::string auxInfo = "");
std::string GetXMLOpen_packet (uint32_t fromLp, uint32_t fromId, double fbTx, double lbTx, std::string auxInfo = "");
std::string GetXMLOpenClose_rx (uint32_t toLp, uint32_t toId, double fbRx, double lbRx);
std::string GetXMLOpen_wpacket (uint32_t fromLp,uint32_t fromId, double fbTx, double lbTx, double range);
std::string GetXMLOpen_wpacket (uint32_t fromLp, uint32_t fromId, double fbTx, double lbTx, double range);
std::string GetXMLClose (std::string name) {return "</" + name + ">\n"; }
std::string GetXMLOpenClose_meta (std::string metaInfo);