Avoid collision between parameter names and function names.

Change-Id: I206d05c47c9f9089a201783ae2d0856c97a5e502
Reviewed-on: https://code.wireshark.org/review/29588
Reviewed-by: Guy Harris <guy@alum.mit.edu>

diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index b2db4ec2f2d7e2531e7e75592c2cf94e12564f3a..21db2135727a90526c985c9915219c1cb0f2610b 100644 (file)
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -6265,7 +6265,7 @@ ssl_dissect_hnd_hello_ext_supported_versions(ssl_common_dissect_t *hf, tvbuff_t
         proto_tree_add_item_ret_uint(tree, hf->hf.hs_ext_supported_version, tvb, offset, 2, ENC_BIG_ENDIAN, &version);
         offset += 2;
 
-        draft_version = tls13_draft_version(version);
+        draft_version = extract_tls13_draft_version(version);
         max_draft_version = MAX(draft_version, max_draft_version);
     }
     if (!ssl_end_vector(hf, tvb, pinfo, tree, offset, next_offset)) {
@@ -7278,7 +7278,7 @@ ssl_try_set_version(SslSession *session, SslDecryptSession *ssl,
         return;
 
     if (handshake_type == SSL_HND_SERVER_HELLO) {
-        tls13_draft = tls13_draft_version(version);
+        tls13_draft = extract_tls13_draft_version(version);
         if (tls13_draft != 0) {
             /* This is TLS 1.3 (a draft version). */
             version = TLSV1DOT3_VERSION;
@@ -7657,7 +7657,7 @@ ssl_dissect_hnd_hello_retry_request(ssl_common_dissect_t *hf, tvbuff_t *tvb,
 
     proto_tree_add_item_ret_uint(tree, hf->hf.hs_server_version, tvb,
                                  offset, 2, ENC_BIG_ENDIAN, &version);
-    draft_version = tls13_draft_version(version);
+    draft_version = extract_tls13_draft_version(version);
     offset += 2;
 
     if (draft_version == 0 || draft_version >= 19) {

diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h
index 29ece1179f4ecd1d4ff57cff3d5197dbb6e2b7ca..01e0b3332761037c1231630a424e57c3957e9ce5 100644 (file)
--- a/epan/dissectors/packet-ssl-utils.h
+++ b/epan/dissectors/packet-ssl-utils.h
@@ -271,7 +271,7 @@ typedef struct _StringInfo {
 #define DTLSV1DOT2_VERSION     0xfefd
 
 /* Returns the TLS 1.3 draft version or 0 if not applicable. */
-static inline guint8 tls13_draft_version(guint32 version) {
+static inline guint8 extract_tls13_draft_version(guint32 version) {
     if ((version & 0xff00) == 0x7f00) {
         return (guint8) version;
     }