diff options
author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2010-12-22 23:09:31 +0000 |
---|---|---|
committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2010-12-22 23:09:31 +0000 |
commit | 8d6a5fba464b3e04ff27f659bb82aaf8f368a6d2 (patch) | |
tree | c5186608af9c56651849bc4b9f93b79f5b3cdc1c | |
parent | 3c9cfef565a362375a397d30d215ea18c4c77765 (diff) |
Avoid the need for cf_mark_frame stubs.
svn path=/trunk/; revision=35248
-rw-r--r-- | rawshark.c | 9 | ||||
-rw-r--r-- | tap-rtp-common.c | 6 | ||||
-rw-r--r-- | tshark.c | 6 |
3 files changed, 2 insertions, 19 deletions
diff --git a/rawshark.c b/rawshark.c index a02ae0cbf8..a88d6fee5e 100644 --- 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 d3364d5d2f..c8b319a7d4 100644 --- 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; } @@ -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; |