Changeset 1863

Show
Ignore:
Timestamp:
05/03/07 22:50:23 (21 months ago)
Author:
aturner
Message:

remove last attribute((unused)) and replace with _U_. fixes #168

Location:
trunk/src
Files:
6 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/common/sendpacket.c

    r1804 r1863  
    146146#include <net/if_dl.h> // used for get_hwaddr_bpf() 
    147147 
    148 static sendpacket_t *sendpacket_open_bpf(const char *, char *) __attribute__((unused)); 
    149 static struct tcpr_ether_addr *sendpacket_get_hwaddr_bpf(sendpacket_t *) __attribute__((unused)); 
     148static sendpacket_t *sendpacket_open_bpf(const char *, char *) _U_; 
     149static struct tcpr_ether_addr *sendpacket_get_hwaddr_bpf(sendpacket_t *) _U_; 
    150150 
    151151#endif /* HAVE_BPF */ 
    152152 
    153153#ifdef HAVE_LIBNET 
    154 static sendpacket_t *sendpacket_open_libnet(const char *, char *) __attribute__((unused)); 
    155 static struct tcpr_ether_addr *sendpacket_get_hwaddr_libnet(sendpacket_t *) __attribute__((unused)); 
     154static sendpacket_t *sendpacket_open_libnet(const char *, char *) _U_; 
     155static struct tcpr_ether_addr *sendpacket_get_hwaddr_libnet(sendpacket_t *) _U_; 
    156156#endif /* HAVE_LIBNET */ 
    157157 
    158158#if (defined HAVE_PCAP_INJECT || defined HAVE_PCAP_SENDPACKET) 
    159 static sendpacket_t *sendpacket_open_pcap(const char *, char *) __attribute__((unused)); 
    160 static struct tcpr_ether_addr *sendpacket_get_hwaddr_pcap(sendpacket_t *) __attribute__((unused)); 
     159static sendpacket_t *sendpacket_open_pcap(const char *, char *) _U_; 
     160static struct tcpr_ether_addr *sendpacket_get_hwaddr_pcap(sendpacket_t *) _U_; 
    161161#endif /* HAVE_PCAP_INJECT || HAVE_PACKET_SENDPACKET */ 
    162162 

  • trunk/src/flow/flownode.c

    r1798 r1863  
    109109 */ 
    110110struct session_t * 
    111 newnode(__attribute__((unused)) char proto, u_char * key, ipv4_hdr_t * ip_hdr, void *l4) 
     111newnode(_U_ char proto, u_char * key, ipv4_hdr_t * ip_hdr, void *l4) 
    112112{ 
    113113    struct sockaddr_in sa; 

  • trunk/src/tcpedit/plugins/dlt_ieee80211/ieee80211.c

    r1841 r1863  
    4848 */ 
    4949static char dlt_name[] = "ieee80211"; 
    50 __attribute__((unused)) static char dlt_prefix[] = "ieee802_11"; 
     50_U_ static char dlt_prefix[] = "ieee802_11"; 
    5151static u_int16_t dlt_value = DLT_IEEE802_11; 
    5252 
    … …  
    221221 */ 
    222222int  
    223 dlt_ieee80211_encode(tcpeditdlt_t *ctx, u_char **packet_ex, int pktlen, __attribute__((unused)) tcpr_dir_t dir) 
     223dlt_ieee80211_encode(tcpeditdlt_t *ctx, u_char **packet_ex, int pktlen, _U_ tcpr_dir_t dir) 
    224224{ 
    225225    u_char *packet; 

  • trunk/src/tcpedit/plugins/dlt_null/null.c

    r1841 r1863  
    4444 
    4545static char dlt_name[] = "null"; 
    46 static char __attribute__((unused)) dlt_prefix[] = "null"; 
     46static char _U_ dlt_prefix[] = "null"; 
    4747static u_int16_t dlt_value = DLT_NULL; 
    4848 
    … …  
    222222 */ 
    223223int  
    224 dlt_null_encode(tcpeditdlt_t *ctx, u_char **packet_ex, int pktlen, __attribute__((unused)) tcpr_dir_t dir) 
     224dlt_null_encode(tcpeditdlt_t *ctx, u_char **packet_ex, int pktlen, _U_ tcpr_dir_t dir) 
    225225{ 
    226226    u_char *packet; 
    … …  
    318318 */     
    319319u_char * 
    320 dlt_null_get_mac(tcpeditdlt_t *ctx, __attribute__((unused)) tcpeditdlt_mac_type_t mac, const u_char *packet, const int pktlen) 
     320dlt_null_get_mac(tcpeditdlt_t *ctx, _U_ tcpeditdlt_mac_type_t mac, const u_char *packet, const int pktlen) 
    321321{ 
    322322    assert(ctx); 

  • trunk/src/tcpedit/plugins/dlt_raw/raw.c

    r1841 r1863  
    4343/* FIXME: edit these variables to taste */ 
    4444static char dlt_name[] = "raw"; 
    45 static char __attribute__((unused)) dlt_prefix[] = "raw"; 
     45static char _U_ dlt_prefix[] = "raw"; 
    4646static u_int16_t dlt_value = DLT_RAW; 
    4747 
    … …  
    208208 */ 
    209209int  
    210 dlt_raw_encode(tcpeditdlt_t *ctx, u_char **packet_ex, int pktlen, __attribute__((unused))tcpr_dir_t dir) 
     210dlt_raw_encode(tcpeditdlt_t *ctx, u_char **packet_ex, int pktlen, _U_ tcpr_dir_t dir) 
    211211{ 
    212212    u_char *packet; 
    … …  
    299299 */     
    300300u_char * 
    301 dlt_raw_get_mac(tcpeditdlt_t *ctx, __attribute__((unused)) tcpeditdlt_mac_type_t mac, const u_char *packet, const int pktlen) 
     301dlt_raw_get_mac(tcpeditdlt_t *ctx, _U_ tcpeditdlt_mac_type_t mac, const u_char *packet, const int pktlen) 
    302302{ 
    303303    assert(ctx); 

  • trunk/src/tcpedit/plugins/dlt_user/user.c

    r1841 r1863  
    4242 
    4343static char dlt_name[] = "user"; 
    44 static char __attribute__((unused)) dlt_prefix[] = "user"; 
     44static char _U_ dlt_prefix[] = "user"; 
    4545static u_int16_t dlt_value = DLT_USER0; 
    4646 
    … …  
    346346 */     
    347347u_char * 
    348 dlt_user_get_mac(tcpeditdlt_t *ctx, __attribute__((unused)) tcpeditdlt_mac_type_t mac, const u_char *packet, const int pktlen) 
     348dlt_user_get_mac(tcpeditdlt_t *ctx, _U_ tcpeditdlt_mac_type_t mac, const u_char *packet, const int pktlen) 
    349349{ 
    350350    assert(ctx);