plugins: remove check of NULL pointers before calling weechat_string_dyn_free() (issue #865)

6 files changed, 10 insertions, 20 deletions

diff --git a/src/plugins/irc/irc-batch.c b/src/plugins/irc/irc-batch.c
index b3ed06e64..a91fa79e4 100644
--- a/src/plugins/irc/irc-batch.c
+++ b/src/plugins/irc/irc-batch.c
@@ -186,8 +186,7 @@ irc_batch_free (struct t_irc_server *server, struct t_irc_batch *batch)
     free (batch->type);
     free (batch->parameters);
     weechat_hashtable_free (batch->tags);
-    if (batch->messages)
-        weechat_string_dyn_free (batch->messages, 1);
+    weechat_string_dyn_free (batch->messages, 1);
 
     /* remove batch from list */
     if (batch->prev_batch)
diff --git a/src/plugins/irc/irc-join.c b/src/plugins/irc/irc-join.c
index 9889e40eb..81ac96863 100644
--- a/src/plugins/irc/irc-join.c
+++ b/src/plugins/irc/irc-join.c
@@ -433,8 +433,7 @@ irc_join_build_string (struct t_arraylist *arraylist)
 end:
     if (channels)
         result = weechat_string_dyn_free (channels, 0);
-    if (keys)
-        weechat_string_dyn_free (keys, 1);
+    weechat_string_dyn_free (keys, 1);
 
     return (result) ? result : strdup ("");
 }
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index 16988abbc..48f3588b0 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -312,8 +312,7 @@ irc_protocol_tags (struct t_irc_protocol_ctxt *ctxt, const char *extra_tags)
               (ptr_address && ptr_address[0]) ? ptr_address : "",
               str_log_level);
 
-    if (str_irc_tags)
-        weechat_string_dyn_free (str_irc_tags, 1);
+    weechat_string_dyn_free (str_irc_tags, 1);
 
     if (!string[0])
         return NULL;
@@ -938,8 +937,7 @@ irc_protocol_cap_sync (struct t_irc_server *server, int sasl)
 
     free (str_caps_server);
     free (caps_to_enable);
-    if (cap_req)
-        weechat_string_dyn_free (cap_req, 1);
+    weechat_string_dyn_free (cap_req, 1);
 }
 
 /*
@@ -6289,8 +6287,7 @@ IRC_PROTOCOL_CALLBACK(353)
     }
 
     free (str_params);
-    if (str_nicks)
-        weechat_string_dyn_free (str_nicks, 1);
+    weechat_string_dyn_free (str_nicks, 1);
     weechat_string_free_split (nicks);
 
     return WEECHAT_RC_OK;
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index cfe2cd632..0fb74e622 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -6034,12 +6034,9 @@ irc_server_build_autojoin (struct t_irc_server *server)
     return weechat_string_dyn_free (channels_with_key, 0);
 
 error:
-    if (channels_with_key)
-        weechat_string_dyn_free (channels_with_key, 1);
-    if (channels_others)
-        weechat_string_dyn_free (channels_others, 1);
-    if (keys)
-        weechat_string_dyn_free (keys, 1);
+    weechat_string_dyn_free (channels_with_key, 1);
+    weechat_string_dyn_free (channels_others, 1);
+    weechat_string_dyn_free (keys, 1);
     return NULL;
 }
 
diff --git a/src/plugins/relay/api/remote/relay-remote-event.c b/src/plugins/relay/api/remote/relay-remote-event.c
index 46239d58c..13496dc52 100644
--- a/src/plugins/relay/api/remote/relay-remote-event.c
+++ b/src/plugins/relay/api/remote/relay-remote-event.c
@@ -173,8 +173,7 @@ RELAY_REMOTE_EVENT_CALLBACK(line)
         (prefix && prefix[0]) ? "\t" : "",
         message);
 
-    if (tags)
-        weechat_string_dyn_free (tags, 1);
+    weechat_string_dyn_free (tags, 1);
 
     return WEECHAT_RC_OK;
 }
diff --git a/src/plugins/relay/relay-http.c b/src/plugins/relay/relay-http.c
index 6da952cf2..62dfb839c 100644
--- a/src/plugins/relay/relay-http.c
+++ b/src/plugins/relay/relay-http.c
@@ -1329,8 +1329,7 @@ end:
 void
 relay_http_request_free (struct t_relay_http_request *request)
 {
-    if (request->raw)
-        weechat_string_dyn_free (request->raw, 1);
+    weechat_string_dyn_free (request->raw, 1);
     free (request->method);
     free (request->path);
     weechat_string_free_split (request->path_items);