Changeset 1076 for trunk/lib/libtrace.h.in

Timestamp:

11/03/06 13:28:12 (7 years ago)

Author:

perry

Message:

Don't shadow "link(2)" from unistd.h

File:

• trunk/lib/libtrace.h.in (modified) (14 diffs)

trunk/lib/libtrace.h.in

@@ -569 +569 @@
  * and then prints out the help() function registered with each input module
  */
-DLLEXPORT void trace_help();
+DLLEXPORT void trace_help(void);
 
 /** @name Trace management
@@ -938 +938 @@
  *
  */
-DLLEXPORT void *trace_get_payload_from_link(void *link,
+DLLEXPORT void *trace_get_payload_from_link(void *linkptr,
                 libtrace_linktype_t linktype, 
                 uint16_t *type, uint32_t *remaining);
@@ -1464 +1464 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_tsft(void *link,
+DLLEXPORT bool trace_get_wireless_tsft(void *linkptr,
         libtrace_linktype_t linktype, uint64_t *tsft);
 
@@ -1473 +1473 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_rate(void *link,
+DLLEXPORT bool trace_get_wireless_rate(void *linkptr,
         libtrace_linktype_t linktype, uint8_t *rate);
 
@@ -1483 +1483 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_freq(void *link,
+DLLEXPORT bool trace_get_wireless_freq(void *linkptr,
         libtrace_linktype_t linktype, uint16_t *freq);
 
@@ -1493 +1493 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_signal_strength_dbm(void *link,
+DLLEXPORT bool trace_get_wireless_signal_strength_dbm(void *linkptr,
         libtrace_linktype_t linktype, int8_t *strength);
 
@@ -1503 +1503 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_noise_strength_dbm(void *link,
+DLLEXPORT bool trace_get_wireless_noise_strength_dbm(void *linkptr,
         libtrace_linktype_t linktype, int8_t *strength);
 
@@ -1513 +1513 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_signal_strength_db(void *link,
+DLLEXPORT bool trace_get_wireless_signal_strength_db(void *linkptr,
         libtrace_linktype_t linktype, uint8_t *strength);
 
@@ -1523 +1523 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_noise_strength_db(void *link,
+DLLEXPORT bool trace_get_wireless_noise_strength_db(void *linkptr,
         libtrace_linktype_t linktype, uint8_t *strength);
 
@@ -1533 +1533 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_tx_attenuation(void *link,
+DLLEXPORT bool trace_get_wireless_tx_attenuation(void *linkptr,
         libtrace_linktype_t linktype, uint16_t *attenuation);
 
@@ -1543 +1543 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_tx_attenuation_db(void *link,
+DLLEXPORT bool trace_get_wireless_tx_attenuation_db(void *linkptr,
         libtrace_linktype_t linktype, uint16_t *attenuation);
 
@@ -1551 +1551 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_tx_power_dbm(void *link, libtrace_linktype_t
+DLLEXPORT bool trace_get_wireless_tx_power_dbm(void *linkptr, libtrace_linktype_t
                 linktype, int8_t *txpower);
 
@@ -1560 +1560 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_antenna(void *link,
+DLLEXPORT bool trace_get_wireless_antenna(void *linkptr,
         libtrace_linktype_t linktype, uint8_t *antenna);
 
@@ -1569 +1569 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_fcs(void *link,
+DLLEXPORT bool trace_get_wireless_fcs(void *linkptr,
         libtrace_linktype_t linktype, uint32_t *fcs);