osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix indentation to match editor mode-lines (no tabs, correct indentation, etc); 

Reformat some whitespace;
Remove unneeded variable initialization.

svn path=/trunk/; revision=44461
This commit is contained in:
Bill Meier 2012-08-12 22:21:02 +00:00
parent ad759c88f8
commit e211327f65
1 changed files with 320 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
file.c
View File

@ -1322,9 +1322,12 @@ cf_merge_files(char **out_filenamep, int in_file_count,
shb_hdr->section_length = -1;
/* options */
shb_hdr->opt_comment = g_string_free(comment_gstr, FALSE); /* NULL if not available */
shb_hdr->shb_hardware = NULL; /* NULL if not available, UTF-8 string containing the description of the hardware used to create this section. */
shb_hdr->shb_os = NULL; /* NULL if not available, UTF-8 string containing the name of the operating system used to create this section. */
shb_hdr->shb_user_appl = "Wireshark"; /* NULL if not available, UTF-8 string containing the name of the application used to create this section. */
shb_hdr->shb_hardware = NULL; /* NULL if not available, UTF-8 string containing the */
/* description of the hardware used to create this section. */
shb_hdr->shb_os = NULL; /* NULL if not available, UTF-8 string containing the name */
/* of the operating system used to create this section. */
shb_hdr->shb_user_appl = "Wireshark"; /* NULL if not available, UTF-8 string containing the name */
/* of the application used to create this section. */
/* create fake IDB info */
idb_inf = g_new(wtapng_iface_descriptions_t,1);
@ -1665,7 +1668,6 @@ cf_filter_packets(capture_file *cf, gchar *dftext, gboolean force)
void
cf_reftime_packets(capture_file *cf)
{
ref_time_packets(cf);
}
@ -2155,9 +2157,10 @@ process_specified_packets(capture_file *cf, packet_range_t *range,
union wtap_pseudo_header *, const guint8 *, void *),
void *callback_args)
{
union wtap_pseudo_header pseudo_header;
guint32 framenum;
frame_data *fdata;
union wtap_pseudo_header pseudo_header;
guint8 pd[WTAP_MAX_PACKET_SIZE+1];
psp_return_t ret = PSP_FINISHED;
@ -4533,8 +4536,8 @@ cf_export_specified_packets(capture_file *cf, const char *fname,
int err;
wtap_dumper *pdh;
save_callback_args_t callback_args;
wtapng_section_t *shb_hdr = NULL;
wtapng_iface_descriptions_t *idb_inf = NULL;
wtapng_section_t *shb_hdr;
wtapng_iface_descriptions_t *idb_inf;
int encap;
cf_callback_invoke(cf_cb_file_export_specified_packets_started, (gpointer)fname);