#
#
# patch "administrator.cc"
#  from [e6271c8806d89446734f9c93ce08a24a63dfb4a3]
#    to [b29906af8c0cd3be64a733dce799cbe75ca22486]
# 
# patch "channel.cc"
#  from [c640472ee1249d74eeffcc952e779b2980d555dc]
#    to [17a4608c4e223b7c45c9164e7d882125cbae3059]
# 
# patch "server.cc"
#  from [495a7153e9c9d2d314624c99d8edc5dec5c059db]
#    to [826768a5fe16dccb49bafff754a8f9f0d3cbce60]
# 
# patch "usher.cc"
#  from [6489eda7b440f9f5228dbd9b9e13c906cbff8b73]
#    to [fe56085ef14edeaf5c0e62784769b58b02201032]
#
============================================================
--- administrator.cc	e6271c8806d89446734f9c93ce08a24a63dfb4a3
+++ administrator.cc	b29906af8c0cd3be64a733dce799cbe75ca22486
@@ -234,7 +234,7 @@ void
 }
 
 void
-administrator::add_to_select(int & maxfd, fd_set & rd, fd_set & wr, fd_set & er)
+administrator::add_to_select(int & maxfd, fd_set & rd, fd_set & wr, fd_set & /*er*/)
 {
   if (int(port) == -1)
     return;
@@ -252,7 +252,7 @@ void
 }
 
 void
-administrator::process_selected(fd_set & rd, fd_set & wr, fd_set & er)
+administrator::process_selected(fd_set & rd, fd_set & wr, fd_set & /*er*/)
 {
   if (int(port) == -1)
     return;
============================================================
--- channel.cc	c640472ee1249d74eeffcc952e779b2980d555dc
+++ channel.cc	17a4608c4e223b7c45c9164e7d882125cbae3059
@@ -157,7 +157,7 @@ channel::process_selected(fd_set & rd, f
   if (c < 0 && !cbuf.canread()) {
     srv.close(), s = -1;
   }
-  if ((no_server || have_routed && s < 0) && !sbuf.canread()) {
+  if ((no_server || (have_routed && s < 0)) && !sbuf.canread()) {
     cli.close(), c = -1;
   }
   return true;
============================================================
--- server.cc	495a7153e9c9d2d314624c99d8edc5dec5c059db
+++ server.cc	826768a5fe16dccb49bafff754a8f9f0d3cbce60
@@ -203,7 +203,7 @@ server::connect(string const &name)
     i = manager.servers.find(self());
   map<string, vector<string> > opts = manager.get_opts();
   string logfilename;
-  if (!opts["logdir"].empty());
+  if (!opts["logdir"].empty())
     {
       logfilename = opts["logdir"].front();
       if (!logfilename.empty() && logfilename[logfilename.size()-1] != '/')
============================================================
--- usher.cc	6489eda7b440f9f5228dbd9b9e13c906cbff8b73
+++ usher.cc	fe56085ef14edeaf5c0e62784769b58b02201032
@@ -69,7 +69,7 @@ string conffile;
 string conffile;
 
 
-void sched_reload(int sig)
+void sched_reload(int /*sig*/)
 {
   reload_pending = true;
 }
@@ -91,7 +91,7 @@ bool done;
 };
 
 bool done;
-void sig_end(int sig)
+void sig_end(int /*sig*/)
 {
   done = true;
 }
@@ -123,12 +123,16 @@ int main (int argc, char **argv)
   sa.sa_handler = &sched_reload;
   sigemptyset(&sa.sa_mask);
   sa.sa_flags = 0;
-  while(sigaction(SIGHUP, &sa, &sa_old) == -1 && errno == EINTR);
+  while(sigaction(SIGHUP, &sa, &sa_old) == -1 && errno == EINTR)
+    {}
   sa.sa_handler = SIG_IGN;
-  while(sigaction(SIGPIPE, &sa, &sa_old) == -1 && errno == EINTR);
+  while(sigaction(SIGPIPE, &sa, &sa_old) == -1 && errno == EINTR)
+    {}
   sa.sa_handler = sig_end;
-  while(sigaction(SIGTERM, &sa, &sa_old) == -1 && errno == EINTR);
-  while(sigaction(SIGINT, &sa, &sa_old) == -1 && errno == EINTR);
+  while(sigaction(SIGTERM, &sa, &sa_old) == -1 && errno == EINTR)
+    {}
+  while(sigaction(SIGINT, &sa, &sa_old) == -1 && errno == EINTR)
+    {}
 
   if (admin.serverport == -1)
     {