diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-03-13 15:27:22 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-03-13 15:27:22 +0000 |
| commit | ba7c0cb1b969ba5b162b5bfe34f0cba0240b763d (patch) | |
| tree | 012ae7d053ea83bec4a7908eb402f01ab142bd3a /dumpcap.c | |
| parent | 0e4998190fc10d09283f8b19af0e1f0f9208b4cc (diff) | |
From Jose Pedro Oliveira:
dumpcap.c: code cleaning
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6718
svn path=/trunk/; revision=41535
Diffstat (limited to 'dumpcap.c')
| -rw-r--r-- | dumpcap.c | 28 |
1 files changed, 14 insertions, 14 deletions
@@ -2652,16 +2652,16 @@ capture_loop_init_output(capture_options *capture_opts, loop_data *ld, char *err pcap_opts->snaplen = pcap_snapshot(pcap_opts->pcap_h); } successful = libpcap_write_interface_description_block(global_ld.pdh, - NULL, /* OPT_COMMENT 1 */ - interface_opts.name, /* IDB_NAME 2 */ - interface_opts.descr, /* IDB_DESCRIPTION 3 */ - interface_opts.cfilter?interface_opts.cfilter:"", /* IDB_FILTER 11 */ - os_info_str->str, /* IDB_OS 12 */ + NULL, /* OPT_COMMENT 1 */ + interface_opts.name, /* IDB_NAME 2 */ + interface_opts.descr, /* IDB_DESCRIPTION 3 */ + interface_opts.cfilter, /* IDB_FILTER 11 */ + os_info_str->str, /* IDB_OS 12 */ pcap_opts->linktype, pcap_opts->snaplen, &(global_ld.bytes_written), - 0, /* IDB_IF_SPEED 8 */ - pcap_opts->ts_nsec ? 9 : 6, /* IDB_TSRESOL 9 */ + 0, /* IDB_IF_SPEED 8 */ + pcap_opts->ts_nsec ? 9 : 6, /* IDB_TSRESOL 9 */ &global_ld.err); } @@ -3110,16 +3110,16 @@ do_file_switch_or_stop(capture_options *capture_opts, interface_opts = g_array_index(capture_opts->ifaces, interface_options, i); pcap_opts = g_array_index(global_ld.pcaps, pcap_options *, i); successful = libpcap_write_interface_description_block(global_ld.pdh, - NULL, /* OPT_COMMENT 1 */ - interface_opts.name, /* IDB_NAME 2 */ - interface_opts.descr, /* IDB_DESCRIPTION 3 */ - interface_opts.cfilter?interface_opts.cfilter:"", /* IDB_FILTER 11 */ - os_info_str->str, /* IDB_OS 12 */ + NULL, /* OPT_COMMENT 1 */ + interface_opts.name, /* IDB_NAME 2 */ + interface_opts.descr, /* IDB_DESCRIPTION 3 */ + interface_opts.cfilter, /* IDB_FILTER 11 */ + os_info_str->str, /* IDB_OS 12 */ pcap_opts->linktype, pcap_opts->snaplen, &(global_ld.bytes_written), - 0, /* IDB_IF_SPEED 8 */ - pcap_opts->ts_nsec ? 9 : 6, /* IDB_TSRESOL 9 */ + 0, /* IDB_IF_SPEED 8 */ + pcap_opts->ts_nsec ? 9 : 6, /* IDB_TSRESOL 9 */ &global_ld.err); } |