From c7c56a610c8be8f3b5361bf5a0f6d9b69161a27d Mon Sep 17 00:00:00 2001 From: Matias Fontanini Date: Thu, 24 Jan 2013 13:44:30 -0300 Subject: [PATCH] Done some -pedantic modifications. --- include/arp.h | 2 +- include/bootp.h | 2 +- include/constants.h | 6 +++--- include/dhcp.h | 2 +- include/dns.h | 2 +- include/dot11.h | 4 +--- include/eapol.h | 2 +- include/ethernetII.h | 2 +- include/icmp.h | 2 +- include/ieee802_3.h | 3 +-- include/ip.h | 2 +- include/ip_address.h | 2 +- include/llc.h | 2 +- include/packet_sender.h | 2 +- include/pdu.h | 2 +- include/radiotap.h | 2 +- include/rawpdu.h | 2 +- include/snap.h | 3 +-- include/sniffer.h | 2 +- include/tcp.h | 2 +- include/udp.h | 2 +- 21 files changed, 23 insertions(+), 27 deletions(-) diff --git a/include/arp.h b/include/arp.h index 951c675..c7495ae 100644 --- a/include/arp.h +++ b/include/arp.h @@ -308,5 +308,5 @@ namespace Tins { arphdr _arp; }; -}; +} #endif //TINS_ARP_H diff --git a/include/bootp.h b/include/bootp.h index 8de399e..9517ac6 100644 --- a/include/bootp.h +++ b/include/bootp.h @@ -342,6 +342,6 @@ namespace Tins { bootphdr _bootp; vend_type _vend; }; -}; +} #endif // TINS_BOOTP_H diff --git a/include/constants.h b/include/constants.h index 0004dba..dbd5d25 100644 --- a/include/constants.h +++ b/include/constants.h @@ -148,11 +148,11 @@ namespace Tins { IEEE802154 = 804, /* IEEE 802.15.4 header. */ IEEE802154_PHY = 805, /* IEEE 802.15.4 PHY header. */ VOID_TYPE = 0xFFFF, /* Void type, nothing is known. */ - NONE = 0xFFFE, /* Zero header length. */ + NONE = 0xFFFE /* Zero header length. */ }; }; - }; -}; + } +} #endif // TINS_CONSTANTS_H diff --git a/include/dhcp.h b/include/dhcp.h index 431a23a..15276b6 100644 --- a/include/dhcp.h +++ b/include/dhcp.h @@ -418,6 +418,6 @@ namespace Tins { options_type _options; uint32_t _size; }; -}; +} #endif // TINS_DHCP_H diff --git a/include/dns.h b/include/dns.h index 6f7e771..c99e08e 100644 --- a/include/dns.h +++ b/include/dns.h @@ -646,7 +646,7 @@ namespace Tins { mutable SuffixMap suffixes; mutable SuffixIndices suffix_indices; }; -}; +} #endif // TINS_DNS_H diff --git a/include/dot11.h b/include/dot11.h index 790d2f8..d54b242 100644 --- a/include/dot11.h +++ b/include/dot11.h @@ -3405,8 +3405,6 @@ namespace Tins { StartSequence _start_sequence; uint8_t _bitmap[bitmap_size]; }; -}; - - +} #endif // TINS_DOT_11 diff --git a/include/eapol.h b/include/eapol.h index c6203e7..06fc52f 100644 --- a/include/eapol.h +++ b/include/eapol.h @@ -728,6 +728,6 @@ namespace Tins { rsnhdr _header; key_type _key; }; -}; +} #endif // TINS_EAPOL_H diff --git a/include/ethernetII.h b/include/ethernetII.h index 1dee3d1..0e24e10 100644 --- a/include/ethernetII.h +++ b/include/ethernetII.h @@ -216,7 +216,7 @@ namespace Tins { NetworkInterface _iface; }; -}; +} #endif // TINS_ETHERNET_II_H diff --git a/include/icmp.h b/include/icmp.h index eee7b69..e451ab3 100644 --- a/include/icmp.h +++ b/include/icmp.h @@ -329,6 +329,6 @@ namespace Tins { icmphdr _icmp; }; -}; +} #endif // TINS_ICMP_H diff --git a/include/ieee802_3.h b/include/ieee802_3.h index fed7dd6..0788417 100644 --- a/include/ieee802_3.h +++ b/include/ieee802_3.h @@ -214,8 +214,7 @@ namespace Tins { ethhdr _eth; NetworkInterface _iface; }; - -}; +} #endif // TINS_IEEE802_3_H diff --git a/include/ip.h b/include/ip.h index 18fbf8e..93ad541 100644 --- a/include/ip.h +++ b/include/ip.h @@ -619,6 +619,6 @@ namespace Tins { std::list _ip_options; uint32_t _options_size, _padded_options_size; }; -}; +} #endif // TINS_IP_H diff --git a/include/ip_address.h b/include/ip_address.h index f45179a..d2f47b9 100644 --- a/include/ip_address.h +++ b/include/ip_address.h @@ -136,7 +136,7 @@ namespace Tins { uint32_t ip_addr; }; -}; +} #endif // TINS_IPADDRESS_H diff --git a/include/llc.h b/include/llc.h index 7e059bc..557cbc5 100644 --- a/include/llc.h +++ b/include/llc.h @@ -391,6 +391,6 @@ namespace Tins { std::list information_fields; }; -}; +} #endif // TINS_IEEE8022_H diff --git a/include/packet_sender.h b/include/packet_sender.h index b215c5e..7008e11 100644 --- a/include/packet_sender.h +++ b/include/packet_sender.h @@ -256,6 +256,6 @@ namespace Tins { return "The provided socket type is invalid"; } }; -}; +} #endif // TINS_PACKET_SENDER_H diff --git a/include/pdu.h b/include/pdu.h index cde03dc..dbc33ab 100644 --- a/include/pdu.h +++ b/include/pdu.h @@ -375,6 +375,6 @@ namespace Tins { *lop /= rop; return lop; } -}; +} #endif // TINS_PDU_H diff --git a/include/radiotap.h b/include/radiotap.h index bfd712c..1d68c1f 100644 --- a/include/radiotap.h +++ b/include/radiotap.h @@ -384,6 +384,6 @@ namespace Tins { uint16_t _channel_freq, _rx_flags; uint8_t _antenna, _flags, _rate, _dbm_signal, _dbm_noise, _channel, _max_power; }; -}; +} #endif // TINS_RADIOTAP_H diff --git a/include/rawpdu.h b/include/rawpdu.h index 5481228..8e89170 100644 --- a/include/rawpdu.h +++ b/include/rawpdu.h @@ -133,7 +133,7 @@ namespace Tins { payload_type _payload; }; -}; +} #endif // TINS_RAWPDU_H diff --git a/include/snap.h b/include/snap.h index e242ce1..6d3d162 100644 --- a/include/snap.h +++ b/include/snap.h @@ -167,7 +167,6 @@ namespace Tins { snaphdr _snap; }; - -}; +} #endif // TINS_SNAP_H diff --git a/include/sniffer.h b/include/sniffer.h index aaa34d2..1083916 100644 --- a/include/sniffer.h +++ b/include/sniffer.h @@ -302,6 +302,6 @@ namespace Tins { { return HandlerProxy(ptr, function); } -}; +} #endif // TINS_SNIFFER_H diff --git a/include/tcp.h b/include/tcp.h index 52a479a..246007a 100644 --- a/include/tcp.h +++ b/include/tcp.h @@ -446,6 +446,6 @@ namespace Tins { options_type _options; uint32_t _options_size, _total_options_size; }; -}; +} #endif // TINS_TCP_H diff --git a/include/udp.h b/include/udp.h index a67b2fe..e342d8d 100644 --- a/include/udp.h +++ b/include/udp.h @@ -136,6 +136,6 @@ namespace Tins { udphdr _udp; }; -}; +} #endif // TINS_UDP_H