Changeset 4c00a35

Timestamp:

04/03/07 10:39:37 (14 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:

• libtrace_int.h (modified) (1 diff)
• linktypes.c (modified) (3 diffs)

lib/libtrace_int.h

@@ -361 +361 @@
 void register_format(struct libtrace_format_t *format);
 
-libtrace_linktype_t pcap_linktype_to_libtrace(libtrace_linktype_t linktype);
-libtrace_linktype_t libtrace_to_pcap_linktype(libtrace_linktype_t type);
-libtrace_linktype_t libtrace_to_pcap_dlt(libtrace_linktype_t type);
-libtrace_rt_types_t pcap_linktype_to_rt(libtrace_linktype_t linktype);
-libtrace_linktype_t rt_to_pcap_linktype(libtrace_rt_types_t rt_type);
+libtrace_linktype_t pcap_linktype_to_libtrace(libtrace_dlt_t linktype);
+libtrace_dlt_t libtrace_to_pcap_linktype(libtrace_linktype_t type);
+libtrace_dlt_t libtrace_to_pcap_dlt(libtrace_linktype_t type);
+libtrace_rt_types_t pcap_dlt_to_rt(libtrace_dlt_t linktype);
+libtrace_dlt_t rt_to_pcap_linktype(libtrace_rt_types_t rt_type);
 libtrace_linktype_t erf_type_to_libtrace(uint8_t erf);
 uint8_t libtrace_to_erf_type(libtrace_linktype_t linktype);

lib/linktypes.c

@@ -54 +54 @@
 }
 
-libtrace_linktype_t libtrace_to_pcap_dlt(libtrace_linktype_t type)
+libtrace_dlt_t libtrace_to_pcap_dlt(libtrace_linktype_t type)
 {
         /* If pcap doesn't have a DLT, you can either ask pcap to register
@@ -93 +93 @@
 }
 
-libtrace_linktype_t libtrace_to_pcap_linktype(libtrace_linktype_t type)
+libtrace_dlt_t libtrace_to_pcap_linktype(libtrace_linktype_t type)
 {
         return pcap_dlt_to_pcap_linktype(libtrace_to_pcap_dlt(type));
@@ -113 +113 @@
 }
 
-libtrace_linktype_t rt_to_pcap_linktype(libtrace_rt_types_t rt_type)
+libtrace_dlt_t rt_to_pcap_linktype(libtrace_rt_types_t rt_type)
 {
         assert(rt_type >= TRACE_RT_DATA_DLT);