From ffc06e4614772a681114d4059a072f599ee378f8 Mon Sep 17 00:00:00 2001 From: Test_User Date: Wed, 9 Aug 2023 23:40:58 -0400 Subject: STRING_EQ --- server_network.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'server_network.c') diff --git a/server_network.c b/server_network.c index 6f32425..3d69341 100644 --- a/server_network.c +++ b/server_network.c @@ -374,7 +374,7 @@ int kill_handler(struct string sender, uint64_t argc, struct string *argv) { if (!user) return 0; // TODO: Currently not all local users are considered; fix that, then make this give an error - if (user->server.len == 3 && memcmp(user->server.data, "1HC", 3) == 0) { + if (STRING_EQ(user->server, STRING("1HC"))) { char user_time[21]; snprintf(user_time, 21, "%ld", user->user_ts); char nick_time[21]; @@ -592,7 +592,7 @@ int squit_handler(struct string sender, uint64_t argc, struct string *argv) { for (uint64_t i = 0; i < user_list.len;) { struct user_info *info = user_list.array[i].ptr; - if (argv[0].len == info->server.len && memcmp(argv[0].data, info->server.data, argv[0].len) == 0) { + if (STRING_EQ(info->server, argv[0])) { remove_user(user_list.array[i].name, STRING("*.net *.split")); } else { i++; // removal of the user from the table shifts the next user into place for us @@ -636,7 +636,7 @@ int privmsg_handler(struct string sender, uint64_t argc, struct string *argv) { SENDCLIENT(argv[1]); SENDCLIENT(STRING("\r\n")); } - } else if (argv[0].len == 9 && memcmp(argv[0].data, "1HC000001", 9) == 0) { + } else if (STRING_EQ(argv[0], STRING("1HC000001"))) { SENDCLIENT(STRING(":")); SENDCLIENT(user->nick); SENDCLIENT(STRING("!")); @@ -663,7 +663,7 @@ int privmsg_handler(struct string sender, uint64_t argc, struct string *argv) { SENDCLIENT(argv[1]); SENDCLIENT(STRING("\r\n")); } - } else if (argv[0].len == 9 && memcmp(argv[0].data, "1HC000001", 9) == 0) { + } else if (STRING_EQ(argv[0], STRING("1HC000001"))) { SENDCLIENT(STRING(":")); SENDCLIENT(server->address); SENDCLIENT(STRING(" PRIVMSG ")); @@ -681,7 +681,7 @@ int privmsg_handler(struct string sender, uint64_t argc, struct string *argv) { return 0; offset = command_prefix.len; - } else if (argv[0].len == 9 && memcmp(argv[0].data, "1HC000000", 9) == 0) { + } else if (STRING_EQ(argv[0], STRING("1HC000000"))) { offset = 0; } else { return 0; -- cgit v1.2.3