Author: sapient
Date: Sat Apr 21 21:53:05 2007
New Revision: 16960
URL: http://svn.gna.org/viewcvs/wesnoth?rev=16960&view=rev
Log:
various minor bug/warning fixes
Modified:
trunk/src/campaign_server/campaign_server.cpp
Modified: trunk/src/campaign_server/campaign_server.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/campaign_server/campaign_server.cpp?rev=16960&r1=16959&r2=16960&view=diff
==============================================================================
--- trunk/src/campaign_server/campaign_server.cpp (original)
+++ trunk/src/campaign_server/campaign_server.cpp Sat Apr 21 21:53:05 2007
@@ -235,8 +235,8 @@
campaign_list.add_child("campaign", (**i));
}
cmps =
campaign_list.get_children("campaign");
-
for(config::child_list::iterator i = cmps.begin(); i != cmps.end(); ++i) {
- (**i)["passphrase"] =
"";
+
for(config::child_list::iterator j = cmps.begin(); j != cmps.end(); ++j) {
+ (**j)["passphrase"] =
"";
}
config response;
@@ -399,7 +399,7 @@
LOG_CS <<"client disconnect :
"<<e.message<<" " << network::ip_address(e.socket) << "\n";
e.disconnect();
}
- } catch(config::error& e) {
+ } catch(config::error& /*e*/) {
LOG_CS << "error in receiving data...\n";
}
@@ -419,9 +419,12 @@
}else {
campaign_server("server.cfg").run();
}
- } catch(config::error& e) {
+ } catch(config::error& /*e*/) {
std::cerr << "Could not parse config file\n";
- } catch(io_exception& e) {
+ return 1;
+ } catch(io_exception& /*e*/) {
std::cerr << "File I/O error\n";
- }
+ return 2;
+ }
+ return 0;
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
