diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-07-20 17:27:36 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-07-21 00:28:18 +0000 |
| commit | 3beab65515ab693806a7b64665bfd287133e860e (patch) | |
| tree | 8c6aa291589c54f2f2f96a7dca4bcb5c4518fcdd /cfile.c | |
| parent | be1398c17ca1d5b203a930d9254125d602830aef (diff) | |
| download | wireshark-3beab65515ab693806a7b64665bfd287133e860e.tar.gz | |
No need to check for string option values being null.
A string option, if present, always has a value; it might be a null
*string*, but you won't get a null pointer (if the option isn't present,
it simply isn't present).
Fix some comments while we're at it.
Change-Id: I9c1420f56998a7d04de5c5cc2e92631b181f303a
Reviewed-on: https://code.wireshark.org/review/16564
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'cfile.c')
| -rw-r--r-- | cfile.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -46,11 +46,9 @@ cap_file_get_interface_name(void *data, guint32 interface_id) g_free(idb_info); if (wtapng_if_descr) { - if (wtap_block_get_string_option_value(wtapng_if_descr, OPT_IDB_NAME, &interface_name) == WTAP_OPTTYPE_SUCCESS && - interface_name) + if (wtap_block_get_string_option_value(wtapng_if_descr, OPT_IDB_NAME, &interface_name) == WTAP_OPTTYPE_SUCCESS) return interface_name; - if (wtap_block_get_string_option_value(wtapng_if_descr, OPT_IDB_DESCR, &interface_name) == WTAP_OPTTYPE_SUCCESS && - interface_name) + if (wtap_block_get_string_option_value(wtapng_if_descr, OPT_IDB_DESCR, &interface_name) == WTAP_OPTTYPE_SUCCESS) return interface_name; } return "unknown"; |