1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Shuffle NEW_PACKET_LIST guard

Browse Source 
svn path=/trunk/; revision=30038
This commit is contained in:
Kovarththanan Rajaratnam 2009-09-21 14:13:46 +00:00
parent 8f0d93fb12
commit 03a9cfe84c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
file.c
View File

@ -1800,7 +1800,7 @@ cf_redissect_packets(capture_file *cf)
/* Rescan packets with "old" packet list */ /* Rescan packets with "old" packet list */
#ifndef NEW_PACKET_LIST #ifndef NEW_PACKET_LIST
static void static void
rescan_packets_old(capture_file *cf, const char *action, const char *action_item, rescan_packets(capture_file *cf, const char *action, const char *action_item,
gboolean refilter, gboolean redissect) gboolean refilter, gboolean redissect)
{ {
frame_data *fdata; frame_data *fdata;
@ -2090,16 +2090,13 @@ rescan_packets_old(capture_file *cf, const char *action, const char *action_item
dfilter_free(dfcode); dfilter_free(dfcode);
} }
} }
#endif /* NEW_PACKET_LIST rescan_packets_old*/
#else
static void static void
rescan_packets(capture_file *cf, const char *action, const char *action_item, rescan_packets(capture_file *cf, const char *action, const char *action_item,
gboolean refilter, gboolean redissect) gboolean refilter, gboolean redissect)
{ {
#ifndef NEW_PACKET_LIST
rescan_packets_old(cf, action, action_item, refilter, redissect);
}
#else
/* Rescan packets new packet list */ /* Rescan packets new packet list */
frame_data *fdata; frame_data *fdata;
progdlg_t *progbar = NULL; progdlg_t *progbar = NULL;
@ -2403,6 +2400,7 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item,
} }
} }
#endif /* NEW_PACKET_LIST */ #endif /* NEW_PACKET_LIST */
/* /*
* Scan trough all frame data and recalculate the ref time * Scan trough all frame data and recalculate the ref time
* without rereading the file. * without rereading the file.