list_features: no need to check if the dep array has already be init

There is already a check at the beginning of the function preventing that.

3 files changed, 9 insertions, 18 deletions

diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c
index a78b108a..724b17ac 100644
--- a/telepathy-glib/channel.c
+++ b/telepathy-glib/channel.c
@@ -1361,8 +1361,7 @@ tp_channel_list_features (TpProxyClass *cls G_GNUC_UNUSED)
   features[FEAT_CHAT_STATES].name = TP_CHANNEL_FEATURE_CHAT_STATES;
   features[FEAT_CHAT_STATES].prepare_async =
     tp_channel_prepare_chat_states_async;
-  if (G_UNLIKELY (need_chat_states[0] == 0))
-    need_chat_states[0] = TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE;
+  need_chat_states[0] = TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE;
   features[FEAT_CHAT_STATES].interfaces_needed = need_chat_states;
 
   /* assert that the terminator at the end is there */
diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c
index 20af2f43..faf243d5 100644
--- a/telepathy-glib/connection.c
+++ b/telepathy-glib/connection.c
@@ -1289,22 +1289,19 @@ tp_connection_list_features (TpProxyClass *cls G_GNUC_UNUSED)
   features[FEAT_CAPABILITIES].name = TP_CONNECTION_FEATURE_CAPABILITIES;
   features[FEAT_CAPABILITIES].prepare_async =
       tp_connection_prepare_capabilities_async;
-  if (G_UNLIKELY (need_requests[0] == 0))
-    need_requests[0] = TP_IFACE_QUARK_CONNECTION_INTERFACE_REQUESTS;
+  need_requests[0] = TP_IFACE_QUARK_CONNECTION_INTERFACE_REQUESTS;
   features[FEAT_CAPABILITIES].interfaces_needed = need_requests;
 
   features[FEAT_AVATAR_REQUIREMENTS].name = TP_CONNECTION_FEATURE_AVATAR_REQUIREMENTS;
   features[FEAT_AVATAR_REQUIREMENTS].prepare_async =
     _tp_connection_prepare_avatar_requirements_async;
-  if (G_UNLIKELY (need_avatars[0] == 0))
-    need_avatars[0] = TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS;
+  need_avatars[0] = TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS;
   features[FEAT_AVATAR_REQUIREMENTS].interfaces_needed = need_avatars;
 
   features[FEAT_CONTACT_INFO].name = TP_CONNECTION_FEATURE_CONTACT_INFO;
   features[FEAT_CONTACT_INFO].prepare_async =
     _tp_connection_prepare_contact_info_async;
-  if (G_UNLIKELY (need_contact_info[0] == 0))
-    need_contact_info[0] = TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO;
+  need_contact_info[0] = TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO;
   features[FEAT_CONTACT_INFO].interfaces_needed = need_contact_info;
 
   /* assert that the terminator at the end is there */
diff --git a/tests/lib/my-conn-proxy.c b/tests/lib/my-conn-proxy.c
index 69045d77..ca1c40ab 100644
--- a/tests/lib/my-conn-proxy.c
+++ b/tests/lib/my-conn-proxy.c
@@ -224,20 +224,17 @@ list_features (TpProxyClass *cls G_GNUC_UNUSED)
 
   features[FEAT_B].name = TP_TESTS_MY_CONN_PROXY_FEATURE_B;
   features[FEAT_B].prepare_async = prepare_b_async;
-  if (G_UNLIKELY (need_a[0] == 0))
-    need_a[0] = TP_TESTS_MY_CONN_PROXY_FEATURE_A;
+  need_a[0] = TP_TESTS_MY_CONN_PROXY_FEATURE_A;
   features[FEAT_B].depends_on = need_a;
 
   features[FEAT_WRONG_IFACE].name = TP_TESTS_MY_CONN_PROXY_FEATURE_WRONG_IFACE;
   features[FEAT_WRONG_IFACE].prepare_async = cannot_be_prepared_async;
-  if (G_UNLIKELY (need_channel_core[0] == 0))
-    need_channel_core[0] = TP_CHANNEL_FEATURE_CORE;
+  need_channel_core[0] = TP_CHANNEL_FEATURE_CORE;
   features[FEAT_WRONG_IFACE].interfaces_needed = need_channel_core;
 
   features[FEAT_BAD_DEP].name = TP_TESTS_MY_CONN_PROXY_FEATURE_BAD_DEP;
   features[FEAT_BAD_DEP].prepare_async = cannot_be_prepared_async;
-  if (G_UNLIKELY (need_wrong_iface[0] == 0))
-    need_wrong_iface[0] = TP_TESTS_MY_CONN_PROXY_FEATURE_WRONG_IFACE;
+  need_wrong_iface[0] = TP_TESTS_MY_CONN_PROXY_FEATURE_WRONG_IFACE;
   features[FEAT_BAD_DEP].depends_on = need_wrong_iface;
 
   features[FEAT_FAIL].name = TP_TESTS_MY_CONN_PROXY_FEATURE_FAIL;
@@ -245,8 +242,7 @@ list_features (TpProxyClass *cls G_GNUC_UNUSED)
 
   features[FEAT_FAIL_DEP].name = TP_TESTS_MY_CONN_PROXY_FEATURE_FAIL_DEP;
   features[FEAT_FAIL_DEP].prepare_async = cannot_be_prepared_async;
-  if (G_UNLIKELY (need_fail[0] == 0))
-    need_fail[0] = TP_TESTS_MY_CONN_PROXY_FEATURE_FAIL;
+  need_fail[0] = TP_TESTS_MY_CONN_PROXY_FEATURE_FAIL;
   features[FEAT_FAIL_DEP].depends_on = need_fail;
 
   features[FEAT_RETRY].name = TP_TESTS_MY_CONN_PROXY_FEATURE_RETRY;
@@ -254,8 +250,7 @@ list_features (TpProxyClass *cls G_GNUC_UNUSED)
   features[FEAT_RETRY].can_retry = TRUE;
 
   features[FEAT_RETRY_DEP].name = TP_TESTS_MY_CONN_PROXY_FEATURE_RETRY_DEP;
-  if (G_UNLIKELY (need_retry[0] == 0))
-    need_retry[0] = TP_TESTS_MY_CONN_PROXY_FEATURE_RETRY;
+  need_retry[0] = TP_TESTS_MY_CONN_PROXY_FEATURE_RETRY;
   features[FEAT_RETRY_DEP].prepare_async = prepare_retry_dep_async;
   features[FEAT_RETRY_DEP].depends_on = need_retry;