Changeset 4c00a35


Ignore:
Timestamp:
04/03/07 10:39:37 (15 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:
d36a8c6
Parents:
3d84f6a
Message:

Fix some type errors introduced in the pcap fixes

Location:
lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lib/libtrace_int.h

    r73dd29f r4c00a35  
    361361void register_format(struct libtrace_format_t *format);
    362362
    363 libtrace_linktype_t pcap_linktype_to_libtrace(libtrace_linktype_t linktype);
    364 libtrace_linktype_t libtrace_to_pcap_linktype(libtrace_linktype_t type);
    365 libtrace_linktype_t libtrace_to_pcap_dlt(libtrace_linktype_t type);
    366 libtrace_rt_types_t pcap_linktype_to_rt(libtrace_linktype_t linktype);
    367 libtrace_linktype_t rt_to_pcap_linktype(libtrace_rt_types_t rt_type);
     363libtrace_linktype_t pcap_linktype_to_libtrace(libtrace_dlt_t linktype);
     364libtrace_dlt_t libtrace_to_pcap_linktype(libtrace_linktype_t type);
     365libtrace_dlt_t libtrace_to_pcap_dlt(libtrace_linktype_t type);
     366libtrace_rt_types_t pcap_dlt_to_rt(libtrace_dlt_t linktype);
     367libtrace_dlt_t rt_to_pcap_linktype(libtrace_rt_types_t rt_type);
    368368libtrace_linktype_t erf_type_to_libtrace(uint8_t erf);
    369369uint8_t libtrace_to_erf_type(libtrace_linktype_t linktype);
  • lib/linktypes.c

    r73dd29f r4c00a35  
    5454}
    5555
    56 libtrace_linktype_t libtrace_to_pcap_dlt(libtrace_linktype_t type)
     56libtrace_dlt_t libtrace_to_pcap_dlt(libtrace_linktype_t type)
    5757{
    5858        /* If pcap doesn't have a DLT, you can either ask pcap to register
     
    9393}
    9494
    95 libtrace_linktype_t libtrace_to_pcap_linktype(libtrace_linktype_t type)
     95libtrace_dlt_t libtrace_to_pcap_linktype(libtrace_linktype_t type)
    9696{
    9797        return pcap_dlt_to_pcap_linktype(libtrace_to_pcap_dlt(type));
     
    113113}
    114114
    115 libtrace_linktype_t rt_to_pcap_linktype(libtrace_rt_types_t rt_type)
     115libtrace_dlt_t rt_to_pcap_linktype(libtrace_rt_types_t rt_type)
    116116{
    117117        assert(rt_type >= TRACE_RT_DATA_DLT);
Note: See TracChangeset for help on using the changeset viewer.