Rename irc_send_msg*_tagged to irc_send_tagged_msg* and remove some code

duplication

1 files changed, 6 insertions, 3 deletions

diff --git a/irc.h b/irc.h
index 27e164d3..c96cdad3 100644
--- a/irc.h
+++ b/irc.h
@@ -357,11 +357,14 @@ void irc_send_topic(irc_channel_t *ic, gboolean topic_change);
 void irc_send_whois(irc_user_t *iu);
 void irc_send_who(irc_t *irc, GSList *l, const char *channel);
 void irc_send_msg(irc_user_t *iu, const char *type, const char *dst, const char *msg, const char *prefix);
-void irc_send_msg_tagged(irc_user_t *iu, const char *type, const char *dst, const char *msg, const char *prefix, const char *tags);
 void irc_send_msg_raw(irc_user_t *iu, const char *type, const char *dst, const char *msg);
-void irc_send_msg_raw_tagged(irc_user_t *iu, const char *type, const char *dst, const char *msg, const char *tags);
 void irc_send_msg_f(irc_user_t *iu, const char *type, const char *dst, const char *format, ...) G_GNUC_PRINTF(4, 5);
-void irc_send_msg_f_tagged(irc_user_t *iu, const char *type, const char *dst, const char *tags, const char *format, ...) G_GNUC_PRINTF(5, 6);
+
+void irc_send_tagged_msg(irc_user_t *iu, const char *type, const char *dst, const char *msg, const char *prefix, const char *tags);
+void irc_send_tagged_msg_raw(irc_user_t *iu, const char *type, const char *dst, const char *msg, const char *tags);
+void irc_send_tagged_msg_f(irc_user_t *iu, const char *type, const char *dst, const char *tags, const char *format, ...) G_GNUC_PRINTF(5, 6);
+void irc_send_tagged_msg_vf(irc_user_t *iu, const char *type, const char *dst, const char *tags, const char *format, va_list params);
+
 void irc_send_nick(irc_user_t *iu, const char *new_nick);
 void irc_send_channel_user_mode_diff(irc_channel_t *ic, irc_user_t *iu,
                                      irc_channel_user_flags_t old_flags, irc_channel_user_flags_t new_flags);