From 248b23a44cb86ac825c0af2506fa93a4f617230e Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 26 Nov 2014 17:19:31 +0300
Subject: fix compilation warnings.
---
src/login/parse.c | 12 +++++++-----
src/login/parse.h | 2 +-
src/map/clif.c | 1 -
src/map/pc.c | 1 -
src/map/script.c | 8 ++++----
src/map/utils/formatutils.c | 2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
(limited to 'src')
diff --git a/src/login/parse.c b/src/login/parse.c
index 609583d..ba4efbd 100644
--- a/src/login/parse.c
+++ b/src/login/parse.c
@@ -36,7 +36,9 @@ void login_parse_version(int fd)
send_server_version(fd);
}
-int elogin_parse_client_login_pre(int *fdPtr, struct login_session_data* sd, const char *const ip)
+int elogin_parse_client_login_pre(int *fdPtr,
+ struct login_session_data* sd __attribute__ ((unused)),
+ const char *const ip __attribute__ ((unused)))
{
int fd = *fdPtr;
uint16 command = RFIFOW(fd,0);
@@ -65,7 +67,7 @@ int elogin_parse_client_login_pre(int *fdPtr, struct login_session_data* sd, con
return 0;
}
-int elogin_parse_client_login2(int fd)
+void elogin_parse_client_login2(int fd)
{
char username[NAME_LENGTH];
char password[PASSWD_LEN];
@@ -79,7 +81,7 @@ int elogin_parse_client_login2(int fd)
if (len < 2 || !username[len - 2] == '_' || !memchr("FfMm", username[len - 1], 4))
{
login->login_error(fd, 3);
- return 1;
+ return;
}
safestrncpy(password, (const char*)RFIFOP(fd, 26), NAME_LENGTH);
@@ -102,7 +104,7 @@ int elogin_parse_client_login2(int fd)
{
ShowNotice("Attempt to create an e-mail REFUSED - e-mail is invalid (ip: %s)\n", ip);
login->login_error(fd, 11);
- return 1;
+ return;
}
result = login->mmo_auth(sd, false);
@@ -130,5 +132,5 @@ int elogin_parse_client_login2(int fd)
login->auth_failed(sd, result);
}
- return 0;
+ return;
}
diff --git a/src/login/parse.h b/src/login/parse.h
index c32426a..01a584a 100644
--- a/src/login/parse.h
+++ b/src/login/parse.h
@@ -6,6 +6,6 @@
void login_parse_version(int fd);
int elogin_parse_client_login_pre(int *fd, struct login_session_data* sd, const char *const ip);
-int elogin_parse_client_login2(int fd);
+void elogin_parse_client_login2(int fd);
#endif // EVOL_LOGIN_PARSE
diff --git a/src/map/clif.c b/src/map/clif.c
index 65f5468..68edd81 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -110,7 +110,6 @@ void eclif_charnameack(int *fdPtr, struct block_list *bl)
static void eclif_send_additional_slots(struct map_session_data* sd, struct map_session_data* sd2)
{
- int f;
const int id = sd->bl.id;
const int fd = sd2->fd;
diff --git a/src/map/pc.c b/src/map/pc.c
index 0e59e59..315595e 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -106,7 +106,6 @@ void epc_equipitem_pos(struct map_session_data *sd, struct item_data *id, int *p
void epc_unequipitem_pos(struct map_session_data *sd, int *nPtr, int *posPtr)
{
int pos = *posPtr;
- int n = *nPtr;
unequipPos(EQP_HEAD_LOW, head_bottom, LOOK_HEAD_BOTTOM);
unequipPos(EQP_HEAD_TOP, head_top, LOOK_HEAD_TOP);
diff --git a/src/map/script.c b/src/map/script.c
index 618f89c..ca6907c 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -337,14 +337,14 @@ BUILDIN(setNpcDir)
BUILDIN(rif)
{
- char *str = 0;
+ const char *str = 0;
if (script_getnum(st, 2))
{
str = script_getstr(st, 3);
if (str)
script_pushstr(st, aStrdup(str));
else
- script_pushconststr(st, (unsigned char *)"");
+ script_pushconststr(st, (char *)"");
}
else if (script_hasdata(st, 4))
{
@@ -352,11 +352,11 @@ BUILDIN(rif)
if (str)
script_pushstr(st, aStrdup(str));
else
- script_pushconststr(st, (unsigned char *)"");
+ script_pushconststr(st, (char *)"");
}
else
{
- script_pushconststr(st, (unsigned char *)"");
+ script_pushconststr(st, (char *)"");
}
return true;
diff --git a/src/map/utils/formatutils.c b/src/map/utils/formatutils.c
index 741b2a9..c30af49 100644
--- a/src/map/utils/formatutils.c
+++ b/src/map/utils/formatutils.c
@@ -87,7 +87,7 @@ int format_sub(struct script_state* st, int translate)
char *tmp = strstr(ptr, "@@");
if (!tmp)
break;
- char *item = script_getstr(st, idx);
+ const char *item = script_getstr(st, idx);
int len = strlen(item);
if (len > 50)
break;
--
cgit v1.2.3-70-g09d2