From 4053c255b19c5f45c5a6c78b61348e696e7f3a22 Mon Sep 17 00:00:00 2001 From: Max DeLiso Date: Sat, 12 Sep 2015 22:06:52 +0000 Subject: [PATCH] change event_get_params to return void, remove unneeded allocation --- src/irc/core/irc.c | 10 +++------- src/irc/core/irc.h | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c index 509418b7..a0bf4eef 100644 --- a/src/irc/core/irc.c +++ b/src/irc/core/irc.c @@ -248,16 +248,14 @@ char *event_get_param(char **data) } /* Get count parameters from data */ -char *event_get_params(const char *data, int count, ...) +void event_get_params(const char *data, int count, ...) { - char **str, *tmp, *duprec, *datad; + char **str, *tmp, *datad; gboolean rest; va_list args; - g_return_val_if_fail(data != NULL, NULL); - va_start(args, count); - duprec = datad = g_strdup(data); + datad = g_strdup(data); rest = count & PARAM_FLAG_GETREST; count = PARAM_WITHOUT_FLAGS(count); @@ -273,8 +271,6 @@ char *event_get_params(const char *data, int count, ...) if (str != NULL) *str = tmp; } va_end(args); - - return duprec; } static void irc_server_event(IRC_SERVER_REC *server, const char *line, diff --git a/src/irc/core/irc.h b/src/irc/core/irc.h index b5bd833a..191a98d7 100644 --- a/src/irc/core/irc.h +++ b/src/irc/core/irc.h @@ -51,7 +51,7 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd, /* Get count parameters from data */ #include "commands.h" char *event_get_param(char **data); -char *event_get_params(const char *data, int count, ...); +void event_get_params(const char *data, int count, ...); void irc_irc_init(void); void irc_irc_deinit(void);