From c5c10581b67167add2c874033d2e37c8c07fac70 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 26 Feb 2016 15:18:18 -0800 Subject: Clean up setting *err_str to NULL. Just do it upfront. Change-Id: I5305882b8efd080fcb3e8ea626e09f4682729702 Reviewed-on: https://code.wireshark.org/review/14185 Reviewed-by: Guy Harris --- extcap.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/extcap.c b/extcap.c index b1e6f5a60e..245873a127 100644 --- a/extcap.c +++ b/extcap.c @@ -282,7 +282,7 @@ extcap_get_if_dlts(const gchar *ifname, char **err_str) { gint i; if_capabilities_t *caps = NULL; - if (ifname != NULL && err_str != NULL) + if (err_str != NULL) *err_str = NULL; if ( extcap_if_exists(ifname) ) @@ -291,8 +291,6 @@ extcap_get_if_dlts(const gchar *ifname, char **err_str) { argv[1] = g_strdup(EXTCAP_ARGUMENT_INTERFACE); argv[2] = g_strdup(ifname); - if (err_str) - *err_str = NULL; extcap_foreach(3, argv, dlt_cb, &caps, err_str, ifname); for (i = 0; i < 3; ++i) @@ -410,8 +408,6 @@ extcap_interface_list(char **err_str) { argv = g_strdup(EXTCAP_ARGUMENT_LIST_INTERFACES); - if (err_str) - *err_str = NULL; extcap_foreach(1, &argv, interfaces_cb, &ret, err_str, NULL); g_free(argv); -- cgit v1.2.3