diff options
| author | Guy Harris <guy@alum.mit.edu> | 2011-09-01 09:43:10 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2011-09-01 09:43:10 +0000 |
| commit | e9fc1b72aabaae01cd6cad613dfc88168d8aed9a (patch) | |
| tree | c1bdbe16d5579966f05db9cb334a115e011e08ff /wiretap/mime_file.c | |
| parent | 10a3cb6e0f30290ccce97c01d482f05d083915a6 (diff) | |
| download | wireshark-e9fc1b72aabaae01cd6cad613dfc88168d8aed9a.tar.gz | |
Use guint8 rather than guchar for raw octets and pointers to arrays of
same.
Add to wiretap/pcap-common.c a routine to fill in the pseudo-header for
ATM (by looking at the VPI, VCI, and packet data, and guessing) and
Ethernet (setting the FCS length appropriately). Use it for both pcap
and pcap-ng files.
svn path=/trunk/; revision=38840
Diffstat (limited to 'wiretap/mime_file.c')
| -rw-r--r-- | wiretap/mime_file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/mime_file.c b/wiretap/mime_file.c index e6d937647f..2cb1ebdb36 100644 --- a/wiretap/mime_file.c +++ b/wiretap/mime_file.c @@ -57,7 +57,7 @@ typedef struct { } mime_file_private_t; typedef struct { - const guchar *magic; + const guint8 *magic; guint magic_len; } mime_files_t; @@ -69,7 +69,7 @@ typedef struct { * http://www.jpeg.org/public/jfif.pdf * http://www.w3.org/Graphics/JPEG/itu-t81.pdf */ -static const guchar jpeg_jfif_magic[] = { 0xFF, 0xD8, /* SOF */ +static const guint8 jpeg_jfif_magic[] = { 0xFF, 0xD8, /* SOF */ 0xFF /* start of the next marker */ }; @@ -124,7 +124,7 @@ mime_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) } static gboolean -mime_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_header *pseudo_header _U_, guchar *pd, int length, int *err, gchar **err_info) +mime_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_header *pseudo_header _U_, guint8 *pd, int length, int *err, gchar **err_info) { if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1) { *err_info = NULL; |