aboutsummaryrefslogtreecommitdiffstats
path: root/file.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2009-06-06 00:12:43 +0000
committerGuy Harris <guy@alum.mit.edu>2009-06-06 00:12:43 +0000
commit23a4f326b723424413efd8a42ee463666059e9cb (patch)
treef2db5ae7815798c936943a99b0f0bfb291a6735f /file.c
parentcf91fdf16b2d961024ea062503ce5fb91af28186 (diff)
Clean up white space.
svn path=/trunk/; revision=28646
Diffstat (limited to 'file.c')
-rw-r--r--file.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/file.c b/file.c
index a02c53d49c..4a61e97cd3 100644
--- a/file.c
+++ b/file.c
@@ -380,12 +380,9 @@ cf_close(capture_file *cf)
/* close things, if not already closed before */
if(cf->state != FILE_CLOSED) {
-
- color_filters_cleanup();
-
- cf_reset_state(cf);
-
- cleanup_dissection();
+ color_filters_cleanup();
+ cf_reset_state(cf);
+ cleanup_dissection();
}
cf_callback_invoke(cf_cb_file_closed, cf);
@@ -1036,8 +1033,7 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
} else
fdata->flags.passed_dfilter = 1;
- if( (fdata->flags.passed_dfilter)
- || (edt->pi.fd->flags.ref_time) ){
+ if( (fdata->flags.passed_dfilter) || (edt->pi.fd->flags.ref_time) ){
/* This frame either passed the display filter list or is marked as
a time reference frame. All time reference frames are displayed
even if they dont pass the display filter */
@@ -1096,10 +1092,10 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
* we do both to make sure that when a packet gets un-marked, the
* color will be correctly set (fixes bug 2038)
*/
- fdata->color_filter = color_filters_colorize_packet(row, edt);
- if (fdata->flags.marked) {
- packet_list_set_colors(row, &prefs.gui_marked_fg, &prefs.gui_marked_bg);
- }
+ fdata->color_filter = color_filters_colorize_packet(row, edt);
+ if (fdata->flags.marked) {
+ packet_list_set_colors(row, &prefs.gui_marked_fg, &prefs.gui_marked_bg);
+ }
/* Set the time of the previous displayed frame to the time of this
frame. */