Get rid of a bunch of "warning: redundant redeclaration of" messages.

In that process, include the contents of packet-fmp_notify.h directly
in packet-fmp_notify.c - it wasn't used anywhere else.

svn path=/trunk/; revision=29512

6 files changed, 19 insertions, 61 deletions

diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 3937397488..4a3f20d684 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -1042,7 +1042,6 @@ DISSECTOR_INCLUDES =	\
 	packet-ff.h	\
 	packet-fix.h	\
 	packet-fmp.h	\
-	packet-fmp_notify.h	\
 	packet-fr.h	\
 	packet-frame.h	\
 	packet-ftam.h	\
diff --git a/epan/dissectors/packet-fmp_notify.c b/epan/dissectors/packet-fmp_notify.c
index b41d5ffe95..6be6c88ccb 100644
--- a/epan/dissectors/packet-fmp_notify.c
+++ b/epan/dissectors/packet-fmp_notify.c
@@ -39,8 +39,26 @@
 
 #include "packet-rpc.h"
 #include "packet-fmp.h"
-#include "packet-fmp_notify.h"
 
+#define FMP_NOTIFY_PROG 	1001912
+#define FMP_NOTIFY_VERSION_2 	2
+
+/*
+ * FMP/NOTIFY Procedures
+ */
+#define FMP_NOTIFY_DownGrade		1
+#define FMP_NOTIFY_RevokeList		2
+#define FMP_NOTIFY_RevokeAll 		3
+#define FMP_NOTIFY_FileSetEof 		4
+#define FMP_NOTIFY_RequestDone 		5
+#define FMP_NOTIFY_volFreeze 		6
+#define FMP_NOTIFY_revokeHandleList	7
+
+typedef enum {
+	FMP_LIST_USER_QUOTA_EXCEEDED = 0,
+	FMP_LIST_GROUP_QUOTA_EXCEEDED = 1,
+	FMP_LIST_SERVER_RESOURCE_LOW = 2
+} revokeHandleListReason;
 
 static int proto_fmp_notify = -1;
 static int hf_fmp_handleListLen = -1;
diff --git a/epan/dissectors/packet-fmp_notify.h b/epan/dissectors/packet-fmp_notify.h
deleted file mode 100644
index eb8686ff46..0000000000
--- a/epan/dissectors/packet-fmp_notify.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* packet-fmp_notify.h
- *
- * $Id$
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * 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.
- */
-
-#ifndef PACKET_FMP_NOTIFY_H
-#define PACKET_FMP_NOTIFY_H
-
-#define FMP_NOTIFY_PROG 	1001912
-#define FMP_NOTIFY_VERSION_2 	2
-
-/*
- * FMP/NOTIFY Procedures
- */
-#define FMP_NOTIFY_DownGrade		1
-#define FMP_NOTIFY_RevokeList		2
-#define FMP_NOTIFY_RevokeAll 		3
-#define FMP_NOTIFY_FileSetEof 		4
-#define FMP_NOTIFY_RequestDone 		5
-#define FMP_NOTIFY_volFreeze 		6
-#define FMP_NOTIFY_revokeHandleList	7
-
-typedef enum {
-	FMP_LIST_USER_QUOTA_EXCEEDED = 0,
-	FMP_LIST_GROUP_QUOTA_EXCEEDED = 1,
-	FMP_LIST_SERVER_RESOURCE_LOW = 2
-} revokeHandleListReason;
-int dissect_fmp_notify_status(tvbuff_t *, int, proto_tree *, int *);
-int dissect_fmp_extentList(tvbuff_t *, int, packet_info *, proto_tree *);
-
-#endif
diff --git a/epan/dissectors/packet-scsi-mmc.h b/epan/dissectors/packet-scsi-mmc.h
index 0e3b3a29fe..ed9f9f1f31 100644
--- a/epan/dissectors/packet-scsi-mmc.h
+++ b/epan/dissectors/packet-scsi-mmc.h
@@ -27,6 +27,5 @@
 
 extern int hf_scsi_mmc_opcode;
 extern scsi_cdb_table_t scsi_mmc_table[256];
-extern const value_string scsi_mmc_vals[];
 
 #endif
diff --git a/epan/oids.h b/epan/oids.h
index 8808767010..2143cdb261 100644
--- a/epan/oids.h
+++ b/epan/oids.h
@@ -162,8 +162,6 @@ extern void oid_add_from_string(const char* name, const gchar *oid_str);
  */
 extern gchar *oid_get_default_mib_path(void);
 
-extern void oid_add_from_string(const char* name, const gchar *oid_str);
-
 /* macros for legacy oid functions */
 #define oid_resolv_cleanup() ((void)0)
 #define subid_t guint32
diff --git a/gtk/airpcap_dlg.h b/gtk/airpcap_dlg.h
index c626f12132..3649337188 100644
--- a/gtk/airpcap_dlg.h
+++ b/gtk/airpcap_dlg.h
@@ -145,12 +145,6 @@ void
 update_decryption_mode(GtkWidget *w);
 
 /*
- * Reset configuration
- */
-void
-on_reset_configuration_bt_clicked(GtkWidget *button, gpointer data _U_);
-
-/*
  * Callback for the select row event in the key list widget
  */
 void