diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2010-02-24 20:34:38 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2010-02-24 20:34:38 +0000 |
commit | bae37cf3ac448de559f4c309ba22b790b04f37bb (patch) | |
tree | 4435e2d58d176149d8247c0d5040871c0db1fc45 /file.c | |
parent | 258c8363ece30c13fe60570652a5f08076c6f256 (diff) |
Uh, no need to check for having custom columns to call
col_custom_prime_edt().
svn path=/trunk/; revision=31991
Diffstat (limited to 'file.c')
-rw-r--r-- | file.c | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -2604,8 +2604,7 @@ print_packet(capture_file *cf, frame_data *fdata, /* Fill in the column information if we're printing the summary information. */ if (args->print_args->print_summary) { - if (have_custom_cols(&cf->cinfo)) - col_custom_prime_edt(&edt, &cf->cinfo); + col_custom_prime_edt(&edt, &cf->cinfo); epan_dissect_run(&edt, pseudo_header, pd, fdata, &cf->cinfo); epan_dissect_fill_in_columns(&edt, FALSE, TRUE); } else @@ -2938,8 +2937,7 @@ write_psml_packet(capture_file *cf, frame_data *fdata, if having custom columns. */ proto_tree_needed = have_custom_cols(&cf->cinfo); epan_dissect_init(&edt, proto_tree_needed, proto_tree_needed); - if (proto_tree_needed) - col_custom_prime_edt(&edt, &cf->cinfo); + col_custom_prime_edt(&edt, &cf->cinfo); epan_dissect_run(&edt, pseudo_header, pd, fdata, &cf->cinfo); epan_dissect_fill_in_columns(&edt, FALSE, TRUE); @@ -3014,8 +3012,7 @@ write_csv_packet(capture_file *cf, frame_data *fdata, if having custom columns. */ proto_tree_needed = have_custom_cols(&cf->cinfo); epan_dissect_init(&edt, proto_tree_needed, proto_tree_needed); - if (proto_tree_needed) - col_custom_prime_edt(&edt, &cf->cinfo); + col_custom_prime_edt(&edt, &cf->cinfo); epan_dissect_run(&edt, pseudo_header, pd, fdata, &cf->cinfo); epan_dissect_fill_in_columns(&edt, FALSE, TRUE); |