From 3c13d9e3fd9666d5207effe47d28c3191372764e Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 12 Jun 2014 12:20:34 -0400 Subject: [PATCH] misc: remove some dead code The G_DISABLE_CHECKS version of g_return_if_reached() still returns, it just doesn't log. So don't include a manual return after a return-if-reached. --- libnm-util/nm-utils.c | 6 ++---- src/platform/nm-platform.c | 1 - src/platform/tests/test-common.c | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index a52e36d1e8..385731896f 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -2157,10 +2157,8 @@ nm_utils_hwaddr_ntoa_len (gconstpointer addr, gsize length) char *out, *result; const char *LOOKUP = "0123456789ABCDEF"; - if (!addr || !length) { - g_return_val_if_reached (g_strdup ("")); - return g_strdup (""); - } + g_return_val_if_fail (addr != NULL, g_strdup ("")); + g_return_val_if_fail (length != 0, g_strdup ("")); result = out = g_malloc (length * 3); for (;;) { diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 6a3bbef6b1..71c60ca5bf 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -2542,7 +2542,6 @@ _change_type_to_string (NMPlatformSignalChangeType change_type) return "removed"; default: g_return_val_if_reached ("UNKNOWN"); - return "UNKNOWN"; } } diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c index 4c777cce34..59a770c63f 100644 --- a/src/platform/tests/test-common.c +++ b/src/platform/tests/test-common.c @@ -31,7 +31,6 @@ _change_type_to_string (NMPlatformSignalChangeType change_type) return "removed"; default: g_return_val_if_reached ("UNKNOWN"); - return "UNKNOWN"; } }