Fix mess with ssl_version_short_names[] being defined multiple places

now that it is no longer a static variable in packet-ssl-utils.h.
Leaving it as static caused a warning turned error that it was unused
in the current file (packet-ssl-utils.h).  Resolution: Move the variable
to packet-ssl.c and declare as extern in packet-dtls.c - the only other
place that needs it.


svn path=/trunk/; revision=21161

3 files changed, 12 insertions, 12 deletions

diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c
index 605e3025e2..811fe34d00 100644
--- a/epan/dissectors/packet-dtls.c
+++ b/epan/dissectors/packet-dtls.c
@@ -67,6 +67,8 @@
 #include <epan/tap.h>
 #include "packet-ssl-utils.h"
 
+extern const gchar *ssl_version_short_names;
+
 /* we need to remember the top tree so that subdissectors we call are created
  * at the root and not deep down inside the DTLS decode
  */
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h
index 114a00cd9a..139e37fab2 100644
--- a/epan/dissectors/packet-ssl-utils.h
+++ b/epan/dissectors/packet-ssl-utils.h
@@ -69,18 +69,6 @@
 #define SSL_VER_DTLS     		  5
 #define SSL_VER_PCT                       6
 
-/* corresponds to the #defines above */
-
-const gchar* ssl_version_short_names[] = {
-    "SSL",
-    "SSLv2",
-    "SSLv3",
-    "TLSv1",
-    "TLSv1.1",
-    "DTLSv1.0",
-    "PCT"
-};
-
 /* other defines */
 #define SSL_ID_CHG_CIPHER_SPEC         0x14
 #define SSL_ID_ALERT                   0x15
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c
index 4d1af56300..b0132cba85 100644
--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
@@ -231,6 +231,16 @@ static gint ssl_decrypted_data_avail = 0;
 static gchar* ssl_keys_list = NULL;
 static gchar* ssl_debug_file_name = NULL;
 
+const gchar* ssl_version_short_names[] = {
+    "SSL",
+    "SSLv2",
+    "SSLv3",
+    "TLSv1",
+    "TLSv1.1",
+    "DTLSv1.0",
+    "PCT"
+};
+
 /* Forward declaration we need below */
 void proto_reg_handoff_ssl(void);