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/mpeg.c | |
| parent | 10a3cb6e0f30290ccce97c01d482f05d083915a6 (diff) | |
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/mpeg.c')
| -rw-r--r-- | wiretap/mpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/mpeg.c b/wiretap/mpeg.c index 713aafa027..cf60fe2375 100644 --- a/wiretap/mpeg.c +++ b/wiretap/mpeg.c @@ -94,7 +94,7 @@ mpeg_read_header(wtap *wth, int *err, gchar **err_info, guint32 *n) } static gboolean -mpeg_read_rec_data(FILE_T fh, guchar *pd, int length, int *err, +mpeg_read_rec_data(FILE_T fh, guint8 *pd, int length, int *err, gchar **err_info) { int bytes_read; @@ -240,7 +240,7 @@ mpeg_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) static gboolean mpeg_seek_read(wtap *wth, gint64 seek_off, - union wtap_pseudo_header *pseudo_header _U_, guchar *pd, int length, + 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) |