osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

AFAIKT there's no reason to #include <wsutil/crc32.c>; Include crc32.h like everyone else... 

Also: Do some whitespace and indentation cleanup.

svn path=/trunk/; revision=41281
This commit is contained in:
Bill Meier 2012-03-02 00:31:30 +00:00
parent a146f5a2e2
commit f2c1c108f5
1 changed files with 183 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wiretap/erf.c
View File

@ -49,7 +49,9 @@
#include <stdlib.h>
#include <string.h>
#include <wsutil/crc32.c>
#include <glib.h>
#include <wsutil/crc32.h>
#include "wtap-int.h"
#include "file_wrappers.h"
@ -342,8 +344,9 @@ static int erf_read_header(FILE_T fh,
guint64 erf_exhdr_sw;
guint8 type = 0;
guint16 eth_hdr;
guint32 skiplen=0;
int i = 0 , max = sizeof(pseudo_header->erf.ehdr_list)/sizeof(struct erf_ehdr);
guint32 skiplen = 0;
int i = 0;
int max = sizeof(pseudo_header->erf.ehdr_list)/sizeof(struct erf_ehdr);
wtap_file_read_expected_bytes(erf_header, sizeof(*erf_header), fh, err,
err_info);
@ -419,13 +422,13 @@ static int erf_read_header(FILE_T fh,
case ERF_TYPE_RAW_LINK:
case ERF_TYPE_INFINIBAND:
case ERF_TYPE_INFINIBAND_LINK:
/***
#if 0
if (phdr != NULL) {
phdr->len = g_htons(erf_header->wlen);
phdr->caplen = g_htons(erf_header->wlen);
}
return TRUE;
***/
#endif
break;
case ERF_TYPE_PAD:
case ERF_TYPE_HDLC_POS: