diff options
author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-22 16:49:26 +0000 |
---|---|---|
committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-22 16:49:26 +0000 |
commit | 07cb929d6b4cb473c3a26a0c571785213d348f3c (patch) | |
tree | 3492c323ed20f12a9be465992d60197e57ba0361 /file.c | |
parent | 9398b679e8c3edd64a2e959bff5ffbe719c70f78 (diff) |
dfilter_free() can handle a NULL pointer so don't guard against that before calling it
svn path=/trunk/; revision=30072
Diffstat (limited to 'file.c')
-rw-r--r-- | file.c | 19 |
1 files changed, 6 insertions, 13 deletions
@@ -402,10 +402,8 @@ cf_reset_state(capture_file *cf) cf->plist_chunk = NULL; } #endif - if (cf->rfcode != NULL) { - dfilter_free(cf->rfcode); - cf->rfcode = NULL; - } + dfilter_free(cf->rfcode); + cf->rfcode = NULL; cf->plist_start = NULL; cf->plist_end = NULL; cf_unselect_packet(cf); /* nothing to select */ @@ -1681,9 +1679,8 @@ cf_filter_packets(capture_file *cf, gchar *dftext, gboolean force) } /* Cleanup and release all dfilter resources */ - if (dfcode != NULL){ - dfilter_free(dfcode); - } + dfilter_free(dfcode); + return CF_OK; } @@ -2027,9 +2024,7 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item, } /* Cleanup and release all dfilter resources */ - if (dfcode != NULL){ - dfilter_free(dfcode); - } + dfilter_free(dfcode); } #else @@ -2320,9 +2315,7 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item, } /* Cleanup and release all dfilter resources */ - if (dfcode != NULL){ - dfilter_free(dfcode); - } + dfilter_free(dfcode); } #endif /* NEW_PACKET_LIST */ |