Inline a few checks in the add_packet_to_packet_list() function since it's called...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29435 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/file.c b/file.c
index 65b35f515473d7ad4c6fcd5c4d45bb8b1c07c246..dd89a9a26a1085af79ceb95504e2481f2b3b1655 100644 (file)
--- a/file.c
+++ b/file.c
@@ -1090,9 +1090,13 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
   col_custom_prime_edt(&edt, cinfo);
 #endif
 
-  tap_queue_init(&edt);
+  if (filtering_tap_listeners)
+    tap_queue_init(&edt);
+
   epan_dissect_run(&edt, pseudo_header, buf, fdata, cinfo);
-  tap_push_tapped_queue(&edt);
+
+  if (filtering_tap_listeners)
+    tap_push_tapped_queue(&edt);
 
   /* If we have a display filter, apply it if we're refiltering, otherwise
      leave the "passed_dfilter" flag alone.
@@ -1107,7 +1111,8 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
 
 #ifdef NEW_PACKET_LIST
     if (add_to_packet_list) {
-        epan_dissect_fill_in_columns(&edt, FALSE);
+        if (cinfo)
+            epan_dissect_fill_in_columns(&edt, FALSE);
         row = new_packet_list_append(cinfo, fdata, &edt.pi);
     }
 #endif