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.
This commit is contained in:
Dan Winship 2014-06-12 12:20:34 -04:00
parent 9f114f661a
commit 3c13d9e3fd
3 changed files with 2 additions and 6 deletions

View file

@ -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 (;;) {

View file

@ -2542,7 +2542,6 @@ _change_type_to_string (NMPlatformSignalChangeType change_type)
return "removed";
default:
g_return_val_if_reached ("UNKNOWN");
return "UNKNOWN";
}
}

View file

@ -31,7 +31,6 @@ _change_type_to_string (NMPlatformSignalChangeType change_type)
return "removed";
default:
g_return_val_if_reached ("UNKNOWN");
return "UNKNOWN";
}
}