← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/wireshark/gutsy-security

« back to all changes in this revision

Viewing changes to wiretap/erf.c

  • Committer: Bazaar Package Importer
  • Author(s): Frederic Peters
  • Date: 2007-04-01 08:58:40 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20070401085840-or3qhrpv8alt1bwg
Tags: 0.99.5-1
* New upstream release.
* debian/patches/09_idl2wrs.dpatch: updated to patch idl2wrs.sh.in.

Show diffs side-by-side

added added

removed removed

Lines of Context:
wiretap/erf.c
32
32
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
33
33
* POSSIBILITY OF SUCH DAMAGE.
34
34
*
35
 
* $Id: erf.c 16971 2006-01-07 01:19:29Z ulfl $
 
35
* $Id: erf.c 20013 2006-11-29 06:44:07Z etxrab $
36
36
*/
37
37
 
38
38
/* 
69
69
                guint32 *bytes_read,
70
70
                guint32 *packet_size);
71
71
static gboolean erf_read(wtap *wth, int *err, gchar **err_info,
72
 
                long *data_offset);
73
 
static gboolean erf_seek_read(wtap *wth, long seek_off,
 
72
                gint64 *data_offset);
 
73
static gboolean erf_seek_read(wtap *wth, gint64 seek_off,
74
74
                union wtap_pseudo_header *pseudo_header, guchar *pd,
75
75
                int length, int *err, gchar **err_info);
76
76
static void erf_close(wtap *wth);
123
123
                guint32 packet_size;
124
124
                erf_timestamp_t ts;
125
125
 
126
 
                if (file_read(&header,1,sizeof(header),wth->fh) != sizeof(header)) {
 
126
                int r = file_read(&header,1,sizeof(header),wth->fh);
 
127
 
 
128
                if (r == 0 ) break;
 
129
                if (r != sizeof(header)) {
127
130
                        if ((*err = file_error(wth->fh)) != 0)
128
131
                                return -1;
129
132
                        else
209
212
 
210
213
/* Read the next packet */
211
214
static gboolean erf_read(wtap *wth, int *err, gchar **err_info,
212
 
    long *data_offset)
 
215
    gint64 *data_offset)
213
216
{
214
217
        erf_header_t erf_header;
215
218
        guint32 packet_size, bytes_read;
249
252
        return TRUE;
250
253
}
251
254
 
252
 
static gboolean erf_seek_read(wtap *wth, long seek_off,
 
255
static gboolean erf_seek_read(wtap *wth, gint64 seek_off,
253
256
                union wtap_pseudo_header *pseudo_header, guchar *pd,
254
257
                int length, int *err, gchar **err_info)
255
258
{