Fix warnings

svn path=/trunk/; revision=53885

6 files changed, 5 insertions, 12 deletions

diff --git a/epan/dissectors/packet-devicenet.c b/epan/dissectors/packet-devicenet.c
index 2632cc7945..b997da4d6d 100644
--- a/epan/dissectors/packet-devicenet.c
+++ b/epan/dissectors/packet-devicenet.c
@@ -24,7 +24,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #include "config.h"
 
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 792fbb54a1..e06238c8bb 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -10052,9 +10052,6 @@ static int dissect_bss_max_idle_period(proto_tree *tree, tvbuff_t *tvb,
   return offset;
 }
 
-static int add_tagged_field(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
-                            int offset, int ftype);
-
 enum tfs_request_subelem_id {
   TFS_REQ_SUBELEM_TFS = 1,
   TFS_REQ_SUBELEM_VENDOR_SPECIFIC = 221
diff --git a/epan/dissectors/packet-netlink-route.c b/epan/dissectors/packet-netlink-route.c
index 7d2ac45d21..f89c9af2c1 100644
--- a/epan/dissectors/packet-netlink-route.c
+++ b/epan/dissectors/packet-netlink-route.c
@@ -88,7 +88,7 @@ enum {
 	WS_RTM_GETNETCONF = 82,
 	WS_RTM_NEWMDB = 84,
 	WS_RTM_DELMDB = 85,
-	WS_RTM_GETMDB = 86,
+	WS_RTM_GETMDB = 86
 };
 
 /* values for rta_type (network interface) from <linux/if_link.h> */
@@ -138,7 +138,7 @@ enum ws_ifa_attr_type {
 	WS_IFA_BROADCAST   = 4,
 	WS_IFA_ANYCAST     = 5,
 	WS_IFA_CACHEINFO   = 6,
-	WS_IFA_MULTICAST   = 7,
+	WS_IFA_MULTICAST   = 7
 };
 
 /* values for rta_type (route) from <linux/rtnetlink.h> */
@@ -231,7 +231,7 @@ enum {
 	WS_IFF_DYNAMIC     =  0x8000,
 	WS_IFF_LOWER_UP    = 0x10000,
 	WS_IFF_DORMANT     = 0x20000,
-	WS_IFF_ECHO        = 0x40000,
+	WS_IFF_ECHO        = 0x40000
 };
 
 /* values for ifaddrmsg.ifa_flags <linux/if_addr.h> */
diff --git a/epan/stats_tree.c b/epan/stats_tree.c
index 48bdfc9812..6c316b45ac 100644
--- a/epan/stats_tree.c
+++ b/epan/stats_tree.c
@@ -1236,7 +1236,7 @@ extern gint
 stat_node_array_sortcmp (gconstpointer a, gconstpointer b, gpointer user_data)
 {
 	/* user_data is *guint value to st_flags */
-	return stats_tree_sort_compare (*(stat_node**)a,*(stat_node**)b,
+	return stats_tree_sort_compare (*(const stat_node**)a,*(const stat_node**)b,
 					((sortinfo*)user_data)->sort_column,((sortinfo*)user_data)->sort_descending);
 }
 
diff --git a/epan/tcap-persistentdata.c b/epan/tcap-persistentdata.c
index f046452deb..7e84f5e963 100644
--- a/epan/tcap-persistentdata.c
+++ b/epan/tcap-persistentdata.c
@@ -93,8 +93,6 @@ static struct tcaphash_context_t *tcaphash_end_matching(tvbuff_t *tvb, packet_in
 static struct tcaphash_context_t *tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 							 struct tcapsrt_info_t *p_tcapsrt_info);
 
-struct tcapsrt_info_t *tcapsrt_razinfo(void);
-
 /* When several Tcap components are received in a single TCAP message,
    we have to use several buffers for the stored parameters
    because else this data are erased during TAP dissector call */
diff --git a/epan/to_str.c b/epan/to_str.c
index 03e81f6a0d..781eeadbb9 100644
--- a/epan/to_str.c
+++ b/epan/to_str.c
@@ -297,8 +297,6 @@ static const char fast_strings[][4] = {
 "248", "249", "250", "251", "252", "253", "254", "255"
 };
 
-char *uint_to_str_back(char *ptr, guint32 value);
-
 void
 guint32_to_str_buf(guint32 u, gchar *buf, int buf_len) {
   int str_len = guint32_to_str_buf_len(u)+1;