aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/data.c7
-rw-r--r--src/data.h15
-rw-r--r--src/login.c1
-rw-r--r--src/login.h2
4 files changed, 1 insertions, 24 deletions
diff --git a/src/data.c b/src/data.c
index da9d080..c0c0ae7 100644
--- a/src/data.c
+++ b/src/data.c
@@ -32,7 +32,7 @@ int try_load_plr(char *player_name, playerc_t *plr) {
FILE *fp;
- if (fp = fopen(fname, "r")) {
+ if ((fp = fopen(fname, "r"))) {
debug("Got fp\n");
@@ -119,11 +119,6 @@ int deserialize_player(FILE* fp, player_t* plr) {
return -1;
}
- int c;
-
- enum ParsePlayerState state = ReadingData;
- enum ParsePlayerType type = Xp;
-
plr->pw_hash = (char*) malloc(512);
plr->name = (char*) malloc(32);
diff --git a/src/data.h b/src/data.h
index 3288b44..94bc033 100644
--- a/src/data.h
+++ b/src/data.h
@@ -6,19 +6,4 @@ int try_load_plr(char *player_name, playerc_t *conn);
int try_write_plr(player_t *plr);
-enum ParsePlayerState {
- ReadingData,
- Comma
-};
-
-enum ParsePlayerType {
- Hp,
- MaxHp,
- Level,
- Xp,
- LocationId,
- PwHash,
- Name
-};
-
#endif
diff --git a/src/login.c b/src/login.c
index 5c08c70..212506b 100644
--- a/src/login.c
+++ b/src/login.c
@@ -95,7 +95,6 @@ int step_login(playerc_t *player, int conn_fd) {
send_to_fd(player->conn, "We're sorry, but passwords need to be at least 5 characters");
} else {
player->plr.pw_hash = (char *)malloc(512);
- char* hashbuf = (char *)malloc (1 << 5);
char* pw = trimwhitespace(buf);
err = argon2i_hash_encoded(32, 512, 1, pw, strlen(pw), "adSAaVWIueBwP2jHfAl7diRJ9ijC1Ysb9e920d6d9+I=", strlen("adSAaVWIueBwP2jHfAl7diRJ9ijC1Ysb9e920d6d9+I="), 32, player->plr.pw_hash, 512);
diff --git a/src/login.h b/src/login.h
index b3e60a0..0608889 100644
--- a/src/login.h
+++ b/src/login.h
@@ -4,8 +4,6 @@ enum login_state {
LoggedOut,
EnterPassword,
WantMakeAccount,
- MakePassword,
- MakeConfirmPassword,
Complete
};