Ignore:
Timestamp:
04/21/06 00:42:17 (16 years ago)
Author:
Perry Lorier <perry@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
Children:
d0906e7
Parents:
671566a
Message:

Rewrote libtrace's IO handling to use shim functions when needing to do
zlib io

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/format_legacy.c

    r33e1501 redb18ce  
    7171        union {
    7272                int fd;
    73 #if HAVE_ZLIB
    74                 gzFile *file;
    75 #else   
    76                 /*FILE  *file; */
    77                 int file;
    78 #endif
     73                libtrace_io_t *file;
    7974        } input;
    8075};
     
    113108
    114109static int erf_fin_input(struct libtrace_t *libtrace) {
    115         LIBTRACE_CLOSE(INPUT.file);
     110        libtrace_io_close(INPUT.file);
    116111        free(libtrace->format_data);
    117112        return 0;
     
    142137        }
    143138       
    144         if ((numbytes=LIBTRACE_READ(INPUT.file,
     139        if ((numbytes=libtrace_io_read(INPUT.file,
    145140                                        buffer,
    146141                                        64)) == -1) {
Note: See TracChangeset for help on using the changeset viewer.