summaryrefslogtreecommitdiff
path: root/src/net/messagein.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-09-09 23:11:23 +0300
committerAndrei Karas <akaras@inbox.ru>2011-09-09 23:11:23 +0300
commite3dabb7f0a22c6442dde5f261d3414f9e7369592 (patch)
tree494dbbaeb834f8278f840a996fe9d3dd53f96e1f /src/net/messagein.cpp
parent703a3c4df3732e3e88559147001260f3355d42d6 (diff)
downloadplus-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.gz
plus-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.bz2
plus-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.xz
plus-e3dabb7f0a22c6442dde5f261d3414f9e7369592.zip
Last fix part of shadow variables/methods errors.
Diffstat (limited to 'src/net/messagein.cpp')
-rw-r--r--src/net/messagein.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index 5bfeefdb6..8f177f906 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -190,12 +190,11 @@ std::string MessageIn::readString(int length)
char const *stringEnd
= static_cast<char const *>(memchr(stringBeg, '\0', length));
- std::string readString(stringBeg,
- stringEnd ? stringEnd - stringBeg : length);
+ std::string str(stringBeg, stringEnd ? stringEnd - stringBeg : length);
mPos += length;
PacketCounters::incInBytes(length);
- DEBUGLOG("readString: " + readString);
- return readString;
+ DEBUGLOG("readString: " + str);
+ return str;
}
std::string MessageIn::readRawString(int length)
@@ -215,12 +214,11 @@ std::string MessageIn::readRawString(int length)
char const *stringBeg = mData + mPos;
char const *stringEnd
= static_cast<char const *>(memchr(stringBeg, '\0', length));
- std::string readString(stringBeg,
- stringEnd ? stringEnd - stringBeg : length);
+ std::string str(stringBeg, stringEnd ? stringEnd - stringBeg : length);
mPos += length;
PacketCounters::incInBytes(length);
- DEBUGLOG("readString: " + readString);
+ DEBUGLOG("readString: " + str);
if (stringEnd)
{
@@ -234,11 +232,11 @@ std::string MessageIn::readRawString(int length)
{
DEBUGLOG("readString2: " + hiddenPart);
- return readString + "|" + hiddenPart;
+ return str + "|" + hiddenPart;
}
}
- return readString;
+ return str;
}
}