From 5022b79c172d8057906d621ad0fc0b29686201e8 Mon Sep 17 00:00:00 2001
From: Cara Salter <cara@devcara.com>
Date: Thu, 16 Feb 2023 08:37:18 -0500
Subject: fix: Clean up old enum variants

There were a few enum variants in LoginState that were combined into
WantMakeAccount (MakePassword and MakeConfirmPassword), so they were
removed. Also cleaned up warnings
---
 src/data.c  |  7 +------
 src/data.h  | 15 ---------------
 src/login.c |  1 -
 src/login.h |  2 --
 4 files changed, 1 insertion(+), 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
 };
 
-- 
cgit v1.2.3