Avoid the need for cf_mark_frame stubs.

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

diff --git a/rawshark.c b/rawshark.c
index a02ae0cbf88946c3a54de474a8dd09efe14864d4..a88d6fee5ebf4e0bc939542073afe7944e210d1f 100644 (file)
--- a/rawshark.c
+++ b/rawshark.c
@@ -1648,15 +1648,6 @@ cmdarg_err_cont(const char *fmt, ...)
 }
 
 
-/****************************************************************************************************************/
-/* other "dummies" */
-void
-cf_mark_frame(capture_file *cf _U_, frame_data *frame _U_)
-{
-    /* shouldn't happen */
-    g_assert_not_reached();
-}
-
 /*
  * Editor modelines
  *

diff --git a/tap-rtp-common.c b/tap-rtp-common.c
index d3364d5d2f8e725bff2762e56c7a7f8a974c4a73..c8b319a7d40e2426bb18e0610e5e8f28dedda272 100644 (file)
--- a/tap-rtp-common.c
+++ b/tap-rtp-common.c
@@ -294,9 +294,7 @@ int rtpstream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, con
                        rtp_write_sample(&sample, tapinfo->save_file);
                }
        }
-       /* TODO: This doesn't belong here. We really shouldn't refer to cf_mark_frame()
-        * which only make sense if we're using the GTK UI backend. This effectively forces
-        * tshark/rawshark to implement a cf_mark_frame() stub */
+#ifdef __GTK_H__
        else if (tapinfo->mode == TAP_MARK) {
                if (rtp_stream_info_cmp(&tmp_strinfo, tapinfo->filter_stream_fwd)==0
                        || rtp_stream_info_cmp(&tmp_strinfo, tapinfo->filter_stream_rev)==0)
@@ -304,7 +302,7 @@ int rtpstream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, con
                        cf_mark_frame(&cfile, pinfo->fd);
                }
        }
-
+#endif
        return 0;
 }
 

diff --git a/tshark.c b/tshark.c
index 5032086ba33072850296ca821b99356949e57937..ac81ba007d940f85555ba6e15996b5a2553f1705 100644 (file)
--- a/tshark.c
+++ b/tshark.c
@@ -185,12 +185,6 @@ static void write_failure_message(const char *filename, int err);
 
 capture_file cfile;
 
-void
-cf_mark_frame(capture_file *cf _U_, frame_data *frame _U_)
-{
-  g_assert_not_reached();
-}
-
 static void list_capture_types(void) {
   int i;