diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-02-26 15:18:18 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-02-26 23:29:44 +0000 |
commit | c5c10581b67167add2c874033d2e37c8c07fac70 (patch) | |
tree | adcd482b3d26155c6a06659efb721c37c2fe1826 | |
parent | fcf4ed35a320eefdc84af8d574d118782ca33754 (diff) |
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 <guy@alum.mit.edu>
-rw-r--r-- | extcap.c | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -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); |