diff options
| -rw-r--r-- | src/plugins/alias/alias-command.c | 12 | ||||
| -rw-r--r-- | src/plugins/alias/alias-config.c | 3 | ||||
| -rw-r--r-- | src/plugins/irc/irc-server.c | 3 | ||||
| -rw-r--r-- | src/plugins/relay/relay-command.c | 3 | ||||
| -rw-r--r-- | src/plugins/relay/relay-remote.c | 3 | ||||
| -rw-r--r-- | src/plugins/trigger/trigger.c | 3 | ||||
| -rw-r--r-- | tests/unit/core/test-core-config-file.cpp | 3 |
7 files changed, 11 insertions, 19 deletions
diff --git a/src/plugins/alias/alias-command.c b/src/plugins/alias/alias-command.c index a8b4b20fa..f72d6bc3e 100644 --- a/src/plugins/alias/alias-command.c +++ b/src/plugins/alias/alias-command.c @@ -52,16 +52,14 @@ alias_command_add (const char *alias_name, const char *command, ptr_option = weechat_config_search_option (alias_config_file, alias_config_section_cmd, alias_name); - if (ptr_option) - weechat_config_option_free (ptr_option); + weechat_config_option_free (ptr_option); alias_config_cmd_new_option (alias_name, command); /* create configuration option for completion */ ptr_option = weechat_config_search_option (alias_config_file, alias_config_section_completion, alias_name); - if (ptr_option) - weechat_config_option_free (ptr_option); + weechat_config_option_free (ptr_option); if (completion) alias_config_completion_new_option (alias_name, completion); @@ -212,14 +210,12 @@ alias_command_cb (const void *pointer, void *data, alias_config_file, alias_config_section_cmd, ptr_alias_name); - if (ptr_option) - weechat_config_option_free (ptr_option); + weechat_config_option_free (ptr_option); ptr_option = weechat_config_search_option ( alias_config_file, alias_config_section_completion, ptr_alias_name); - if (ptr_option) - weechat_config_option_free (ptr_option); + weechat_config_option_free (ptr_option); weechat_printf (NULL, _("Alias \"%s\" removed"), name); free (name); } diff --git a/src/plugins/alias/alias-config.c b/src/plugins/alias/alias-config.c index 3a970c9f7..9d8162b65 100644 --- a/src/plugins/alias/alias-config.c +++ b/src/plugins/alias/alias-config.c @@ -116,8 +116,7 @@ alias_config_cmd_delete_cb (const void *pointer, void *data, if (ptr_alias) alias_free (ptr_alias); - if (ptr_option_completion) - weechat_config_option_free (ptr_option_completion); + weechat_config_option_free (ptr_option_completion); } /* diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index 0fb74e622..5cc7e224d 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -2284,8 +2284,7 @@ irc_server_free_data (struct t_irc_server *server) /* free server data */ for (i = 0; i < IRC_SERVER_NUM_OPTIONS; i++) { - if (server->options[i]) - weechat_config_option_free (server->options[i]); + weechat_config_option_free (server->options[i]); } free (server->name); free (server->addresses_eval); diff --git a/src/plugins/relay/relay-command.c b/src/plugins/relay/relay-command.c index 88233448c..237b86d1c 100644 --- a/src/plugins/relay/relay-command.c +++ b/src/plugins/relay/relay-command.c @@ -260,8 +260,7 @@ relay_command_relay (const void *pointer, void *data, relay_config_file, (unix_socket) ? relay_config_section_path : relay_config_section_port, argv_eol[2]); - if (ptr_option) - weechat_config_option_free (ptr_option); + weechat_config_option_free (ptr_option); weechat_printf (NULL, _("%s: relay \"%s\" (%s: %s) removed"), RELAY_PLUGIN_NAME, diff --git a/src/plugins/relay/relay-remote.c b/src/plugins/relay/relay-remote.c index 9d1ba211a..70147f472 100644 --- a/src/plugins/relay/relay-remote.c +++ b/src/plugins/relay/relay-remote.c @@ -787,8 +787,7 @@ relay_remote_free (struct t_relay_remote *remote) free (remote->name); for (i = 0; i < RELAY_REMOTE_NUM_OPTIONS; i++) { - if (remote->options[i]) - weechat_config_option_free (remote->options[i]); + weechat_config_option_free (remote->options[i]); } free (remote->address); free (remote->websocket_key); diff --git a/src/plugins/trigger/trigger.c b/src/plugins/trigger/trigger.c index 6c9327afe..7f411a5dc 100644 --- a/src/plugins/trigger/trigger.c +++ b/src/plugins/trigger/trigger.c @@ -1230,8 +1230,7 @@ trigger_free (struct t_trigger *trigger) free (trigger->name); for (i = 0; i < TRIGGER_NUM_OPTIONS; i++) { - if (trigger->options[i]) - weechat_config_option_free (trigger->options[i]); + weechat_config_option_free (trigger->options[i]); } weechat_string_free_split (trigger->commands); diff --git a/tests/unit/core/test-core-config-file.cpp b/tests/unit/core/test-core-config-file.cpp index b1f369685..ecda87467 100644 --- a/tests/unit/core/test-core-config-file.cpp +++ b/tests/unit/core/test-core-config-file.cpp @@ -1540,7 +1540,8 @@ TEST(CoreConfigFile, OptionFreeData) TEST(CoreConfigFile, OptionFree) { - /* TODO: write tests */ + /* test free of NULL option */ + config_file_option_free (NULL, 1); } /* |