summaryrefslogtreecommitdiff
path: root/src/admin
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-04-22 17:14:28 -0700
committerBen Longbons <b.r.longbons@gmail.com>2014-04-22 17:57:08 -0700
commit1cc5fee5904832da6564f12c858423fd5bd1b2b6 (patch)
treef9318cdd5f45acdd1aceef875de20a0c5b9bde6b /src/admin
parentb195ac27e8234160b29698802deccd109a6fdc25 (diff)
downloadtmwa-1cc5fee5904832da6564f12c858423fd5bd1b2b6.tar.gz
tmwa-1cc5fee5904832da6564f12c858423fd5bd1b2b6.tar.bz2
tmwa-1cc5fee5904832da6564f12c858423fd5bd1b2b6.tar.xz
tmwa-1cc5fee5904832da6564f12c858423fd5bd1b2b6.zip
Make travis happy
Diffstat (limited to 'src/admin')
-rw-r--r--src/admin/ladmin.cpp5
-rw-r--r--src/admin/ladmin.hpp2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/admin/ladmin.cpp b/src/admin/ladmin.cpp
index a4c2464..c078104 100644
--- a/src/admin/ladmin.cpp
+++ b/src/admin/ladmin.cpp
@@ -260,6 +260,7 @@ TString parameters; // needs to be global since it's passed to the parse functio
// really should be added to session data
static
AccountId list_first, list_last;
+static
int list_type, list_count; // parameter to display a list of accounts
static
int already_exit_function = 0; // sometimes, the exit function is called twice... so, don't log twice the message
@@ -286,7 +287,7 @@ void ladmin_log(XString line)
log_with_timestamp(logfp, line);
}
-static
+static __attribute__((noreturn))
void delete_fromlogin(Session *)
{
{
@@ -2770,7 +2771,7 @@ int Connect_login_server(void)
Iprintf("Attempt to connect to login-server...\n"_fmt);
LADMIN_LOG("Attempt to connect to login-server...\n"_fmt);
- login_session = make_connection(login_ip, login_port, SessionParsers{func_parse: parse_fromlogin, func_delete: delete_fromlogin});
+ login_session = make_connection(login_ip, login_port, SessionParsers{.func_parse= parse_fromlogin, .func_delete= delete_fromlogin});
if (!login_session)
return 0;
diff --git a/src/admin/ladmin.hpp b/src/admin/ladmin.hpp
index 034f644..06580eb 100644
--- a/src/admin/ladmin.hpp
+++ b/src/admin/ladmin.hpp
@@ -19,6 +19,6 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-# include "../sanity.hpp"
+# include "fwd.hpp"
#endif // TMWA_ADMIN_LADMIN_HPP