mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

error: declaration of 'in' shadows a previous local

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@110 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
mws
2009-12-22 12:37:15 +00:00
parent e57d1f7ed8
commit af888b3372
1 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/libnet/network_interfaces.cpp
View File

@@ -238,16 +238,16 @@ bool read_interface(const std::string filename, const std::string name, bool &au
advance = true; advance = true;
{ {
std::istringstream in(s.c_str()); std::istringstream in2(s.c_str());
if (!(in >> s)) if (!(in2 >> s))
continue; continue;
if (s != std::string("iface")) if (s != std::string("iface"))
{ {
if (s == std::string("auto")) if (s == std::string("auto"))
{ {
while (in >> s) while (in2 >> s)
{ {
if (s == std::string(name)) if (s == std::string(name))
{ {
@@ -259,16 +259,16 @@ bool read_interface(const std::string filename, const std::string name, bool &au
continue; continue;
} }
if (!(in >> s)) if (!(in2 >> s))
continue; continue;
if (s != std::string(name)) if (s != std::string(name))
continue; continue;
if (!(in >> s)) if (!(in2 >> s))
continue; continue;
if (!(in >> t)) if (!(in2 >> t))
continue; continue;
family = s; family = s;
@@ -280,9 +280,9 @@ bool read_interface(const std::string filename, const std::string name, bool &au
if (!getline(in, s)) if (!getline(in, s))
return true; return true;
std::istringstream in(s.c_str()); std::istringstream in3(s.c_str());
if (!(in >> t)) /* ignore empty lines */ if (!(in3 >> t)) /* ignore empty lines */
continue; continue;
if (t[0] == '#') /* ignore comments */ if (t[0] == '#') /* ignore comments */
@@ -297,7 +297,7 @@ bool read_interface(const std::string filename, const std::string name, bool &au
if (t == std::string("mapping")) if (t == std::string("mapping"))
break; break;
if (!(in >> s)) if (!(in3 >> s))
continue; continue;
attribute[t] = s; attribute[t] = s;