From 2bb913f0c128dbb37737b7c2d7af99ed70801993 Mon Sep 17 00:00:00 2001 From: Jari Matilainen Date: Sun, 19 Jun 2016 16:35:13 +0200 Subject: [PATCH] Fix minor nits --- src/fe-common/core/fe-channels.c | 10 ++++------ src/fe-common/core/fe-server.c | 4 ++-- src/fe-common/irc/fe-irc-server.c | 18 ++++++------------ src/fe-common/irc/fe-ircnet.c | 25 +++++++++---------------- 4 files changed, 21 insertions(+), 36 deletions(-) diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c index dc7d1ee7..2802e933 100644 --- a/src/fe-common/core/fe-channels.c +++ b/src/fe-common/core/fe-channels.c @@ -305,18 +305,16 @@ static void cmd_channel_add_modify(const char *data, gboolean add) cmd_params_free(free_arg); } -/* SYNTAX: CHANNEL ADD [-auto | -noauto] [-bots ] [-botcmd ] - [] */ +/* SYNTAX: CHANNEL ADD|MODIFY [-auto | -noauto] [-bots ] [-botcmd ] + [] */ static void cmd_channel_add(const char *data) { - cmd_channel_add_modify(data, 1); + cmd_channel_add_modify(data, TRUE); } -/* SYNTAX: CHANNEL MODIFY [-auto | -noauto] [-bots ] [-botcmd ] - [] */ static void cmd_channel_modify(const char *data) { - cmd_channel_add_modify(data, 0); + cmd_channel_add_modify(data, FALSE); } /* SYNTAX: CHANNEL REMOVE */ diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c index 827b237e..d6f2841b 100644 --- a/src/fe-common/core/fe-server.c +++ b/src/fe-common/core/fe-server.c @@ -214,12 +214,12 @@ static void cmd_server_add_modify(const char *data, gboolean add) static void cmd_server_add(const char *data) { - cmd_server_add_modify(data, 1); + cmd_server_add_modify(data, TRUE); } static void cmd_server_modify(const char *data) { - cmd_server_add_modify(data, 0); + cmd_server_add_modify(data, FALSE); } /* SYNTAX: SERVER REMOVE
[] [] */ diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c index 360fe212..2e22d6f2 100644 --- a/src/fe-common/irc/fe-irc-server.c +++ b/src/fe-common/irc/fe-irc-server.c @@ -51,18 +51,12 @@ const char *get_visible_target(IRC_SERVER_REC *server, const char *target) return target; } -/* SYNTAX: SERVER ADD [-4 | -6] [-ssl] [-ssl_cert ] [-ssl_pkey ] [-ssl_pass ] - [-ssl_verify] [-ssl_cafile ] [-ssl_capath ] - [-ssl_ciphers ] - [-auto | -noauto] [-network ] [-host ] - [-cmdspeed ] [-cmdmax ] [-port ] -
[ []] */ -/* SYNTAX: SERVER MODIFY [-4 | -6] [-ssl] [-ssl_cert ] [-ssl_pkey ] [-ssl_pass ] - [-ssl_verify] [-ssl_cafile ] [-ssl_capath ] - [-ssl_ciphers ] - [-auto | -noauto] [-network ] [-host ] - [-cmdspeed ] [-cmdmax ] [-port ] -
[ []] */ +/* SYNTAX: SERVER ADD|MODIFY [-4 | -6] [-ssl] [-ssl_cert ] [-ssl_pkey ] [-ssl_pass ] + [-ssl_verify] [-ssl_cafile ] [-ssl_capath ] + [-ssl_ciphers ] + [-auto | -noauto] [-network ] [-host ] + [-cmdspeed ] [-cmdmax ] [-port ] +
[ []] */ /* NOTE: -network replaces the old -ircnet flag. */ static void sig_server_add_fill(IRC_SERVER_SETUP_REC *rec, GHashTable *optlist) diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c index e82fa27f..b2605379 100644 --- a/src/fe-common/irc/fe-ircnet.c +++ b/src/fe-common/irc/fe-ircnet.c @@ -175,28 +175,21 @@ static void cmd_network_add_modify(const char *data, gboolean add) cmd_params_free(free_arg); } -/* SYNTAX: NETWORK ADD [-nick ] [-user ] [-realname ] - [-host ] [-usermode ] [-autosendcmd ] - [-querychans ] [-whois ] [-msgs ] - [-kicks ] [-modes ] [-cmdspeed ] - [-cmdmax ] [-sasl_mechanism ] - [-sasl_username ] [-sasl_password ] - */ +/* SYNTAX: NETWORK ADD|MODIFY [-nick ] [-user ] [-realname ] + [-host ] [-usermode ] [-autosendcmd ] + [-querychans ] [-whois ] [-msgs ] + [-kicks ] [-modes ] [-cmdspeed ] + [-cmdmax ] [-sasl_mechanism ] + [-sasl_username ] [-sasl_password ] + */ static void cmd_network_add(const char *data) { - cmd_network_add_modify(data, 1); + cmd_network_add_modify(data, TRUE); } -/* SYNTAX: NETWORK MODIFY [-nick ] [-user ] [-realname ] - [-host ] [-usermode ] [-autosendcmd ] - [-querychans ] [-whois ] [-msgs ] - [-kicks ] [-modes ] [-cmdspeed ] - [-cmdmax ] [-sasl_mechanism ] - [-sasl_username ] [-sasl_password ] - */ static void cmd_network_modify(const char *data) { - cmd_network_add_modify(data, 0); + cmd_network_add_modify(data, FALSE); } /* SYNTAX: NETWORK REMOVE */