osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Guy Harris 2016-02-26 15:18:18 -08:00
parent fcf4ed35a3
commit c5c10581b6
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extcap.c
View File

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