server: code cleanup

Signed-off-by: He Xian <hexian000@outlook.com>
hexian000 · Nov 23, 2024 · c5ef339 · c5ef339
1 parent c744702
commit c5ef339
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/contrib/csnippets/algo/hashtable.h b/contrib/csnippets/algo/hashtable.h
@@ -26,7 +26,6 @@ typedef bool (*table_iterate_cb)(
 	void *data);
 
 enum table_flags {
-	TABLE_DEFAULT = 0,
 	/* set max load factor to 75%, trading space for speed */
 	TABLE_FAST = 1 << 0,
 };

diff --git a/src/server.c b/src/server.c
@@ -425,22 +425,17 @@ server_new(struct ev_loop *loop, const struct config *restrict conf)
 		/* server mode: disable keepalive and resolve */
 		s->keepalive = 0.0;
 	}
+	int flags = 0;
 	if ((conf->mode & MODE_SERVER) != 0) {
-		s->sessions = table_new(TABLE_FAST);
-		if (s->sessions == NULL) {
-			LOGOOM();
-			server_free(s);
-			return NULL;
-		}
-	} else if ((conf->mode & MODE_CLIENT) != 0) {
-		s->sessions = table_new(TABLE_DEFAULT);
-		if (s->sessions == NULL) {
-			LOGOOM();
-			server_free(s);
-			return NULL;
-		}
+		flags |= TABLE_FAST;
+	}
+	s->sessions = table_new(flags);
+	if (s->sessions == NULL) {
+		LOGOOM();
+		server_free(s);
+		return NULL;
 	}
-	s->pkt.services = table_new(TABLE_DEFAULT);
+	s->pkt.services = table_new(flags);
 	if (s->pkt.services == NULL) {
 		LOGOOM();
 		server_free(s);