[glib: 3/13] gdbusaddress: Remove some always-true branches
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 3/13] gdbusaddress: Remove some always-true branches
- Date: Tue, 19 Mar 2019 10:54:11 +0000 (UTC)
commit 8966b0f8b185caf9edb8918fdc96d64eb2980c5c
Author: Philip Withnall <withnall endlessm com>
Date: Fri Mar 15 14:19:55 2019 +0000
gdbusaddress: Remove some always-true branches
g_strsplit() can never return NULL.
Signed-off-by: Philip Withnall <withnall endlessm com>
gio/gdbusaddress.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c
index d84490ff8..64c60dca9 100644
--- a/gio/gdbusaddress.c
+++ b/gio/gdbusaddress.c
@@ -456,7 +456,7 @@ _g_dbus_address_parse_entry (const gchar *address_entry,
key_value_pairs = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
kv_pairs = g_strsplit (s + 1, ",", 0);
- for (n = 0; kv_pairs != NULL && kv_pairs[n] != NULL; n++)
+ for (n = 0; kv_pairs[n] != NULL; n++)
{
const gchar *kv_pair = kv_pairs[n];
gchar *key;
@@ -949,7 +949,7 @@ g_dbus_address_get_stream_sync (const gchar *address,
last_error = NULL;
addr_array = g_strsplit (address, ";", 0);
- if (addr_array != NULL && addr_array[0] == NULL)
+ if (addr_array[0] == NULL)
{
last_error = g_error_new_literal (G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]