From e392076e19977afe05180d6c2f8f47090105825c Mon Sep 17 00:00:00 2001 From: Alex Denes Date: Tue, 23 Feb 2021 23:33:48 +0000 Subject: [PATCH] Remove quitmsg from struct --- include/memory.h | 2 +- include/types.h | 2 +- src/memory/allocators.c | 8 +------- src/memory/free.c | 1 - 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/include/memory.h b/include/memory.h index 1818177..5f318e4 100644 --- a/include/memory.h +++ b/include/memory.h @@ -30,7 +30,7 @@ IRC_Capability* uirc_malloc_capability(const char* name); IRC_User* uirc_malloc_user(const char* nick, const char* user, const char* real, const char* host); IRC_Message* uirc_malloc_message(const char* command, ...); IRC_Buffer* uirc_malloc_buffer(const char* name, const char* topic, const char* key); -IRC_Network* uirc_malloc_network(const char* addr, const char* svc, const char* pass, const char* quitmsg); +IRC_Network* uirc_malloc_network(const char* addr, const char* svc, const char* pass); #ifdef UIRC_FEATURE_IRCV3 void uirc_free_tag(IRC_Tag* t); diff --git a/include/types.h b/include/types.h index 6f3f59a..23f17cc 100644 --- a/include/types.h +++ b/include/types.h @@ -69,7 +69,7 @@ typedef struct { } IRC_Buffer; typedef struct { - char * addr, *svc, *pass, *quitmsg; + char * addr, *svc, *pass; IRC_User* user; llist_t* buf_list; #ifdef UIRC_FEATURE_IRCV3 diff --git a/src/memory/allocators.c b/src/memory/allocators.c index e497733..9d98ded 100644 --- a/src/memory/allocators.c +++ b/src/memory/allocators.c @@ -158,7 +158,7 @@ uirc_malloc_buffer(const char* name, const char* topic, const char* key) } IRC_Network* -uirc_malloc_network(const char* addr, const char* svc, const char* pass, const char* quitmsg) +uirc_malloc_network(const char* addr, const char* svc, const char* pass) { IRC_Network* ret; assert(addr != NULL); @@ -179,12 +179,6 @@ uirc_malloc_network(const char* addr, const char* svc, const char* pass, const c return NULL; } } - if (quitmsg != NULL) { - if ((ret->quitmsg = malloc_string(quitmsg, strlen(quitmsg))) == NULL) { - uirc_free_network(ret); - return NULL; - } - } return ret; } return NULL; diff --git a/src/memory/free.c b/src/memory/free.c index 25bbd6f..6ab9306 100644 --- a/src/memory/free.c +++ b/src/memory/free.c @@ -101,7 +101,6 @@ uirc_free_network(IRC_Network* n) free(n->addr); free(n->svc); free(n->pass); - free(n->quitmsg); if (n->user != NULL) { uirc_free_user(n->user);