From: Matthew Jordan <mjordan@digium.com>
Date: Sat, 28 Mar 2015 12:32:42 +0000 (+0000)
Subject: clang compiler warnings: Fix -Winitializer-overrides
X-Git-Tag: 14.0.0-beta1~1144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c747b3b12a66ae8618bb7737f1f50e834042a15d;p=thirdparty%2Fasterisk.git

clang compiler warnings: Fix -Winitializer-overrides

This patch fixes clange compiler warnings for initializer overrides.
Specifically:

res_pjsip/config_transport maps PJSIP_TLSV1_METHOD to the same enumeration
value as PJSIP_SSL_DEFAULT_METHOD. When initializing an array containing
those enum values, we therefore initialize the value twice to two different
values, "tlsv1" and "default". This patch changes it to just initialize
the index in the array to "tlsv1".

Review: https://reviewboard.asterisk.org/r/4539/

ASTERISK-24917
Reported by: dkdegroot
patches:
  rb4539.patch submitted by dkdegroot (License 6600)
........

Merged revisions 433682 from http://svn.asterisk.org/svn/asterisk/branches/13


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@433685 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_pjsip/config_transport.c b/res/res_pjsip/config_transport.c
index 9c7298b981..73030b1559 100644
--- a/res/res_pjsip/config_transport.c
+++ b/res/res_pjsip/config_transport.c
@@ -377,7 +377,6 @@ static int transport_tls_method_handler(const struct aco_option *opt, struct ast
 }
 
 static const char *tls_method_map[] = {
-	[PJSIP_SSL_DEFAULT_METHOD] = "default",
 	[PJSIP_SSL_UNSPECIFIED_METHOD] = "unspecified",
 	[PJSIP_TLSV1_METHOD] = "tlsv1",
 	[PJSIP_SSLV2_METHOD] = "sslv2",