Replace GNU old-style field designator extensions to fix clang warnings

(issue ASTERISK-19540)
Reported by: Makoto Dei
Patches:
	clang-gnu-designator.patch uploaded by Makoto Dei (license 5027)
........
Also add from the patch the portion in res_fax_spandsp that didn't apply to 1.8

Merged revisions 361142 from http://svn.asterisk.org/svn/asterisk/branches/1.8
(closes issue ASTERISK-19540)

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

diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c
index 1b7525ef9b4512aeb393e39d7b6f8fea1d55e672..f9ee8f997773256b371fd2725118aa2c91d01980 100644 (file)
--- a/addons/chan_ooh323.c
+++ b/addons/chan_ooh323.c
@@ -129,9 +129,9 @@ static struct ast_rtp_glue ooh323_rtp = {
 };
 
 static struct ast_udptl_protocol ooh323_udptl = {
-       type: "H323",
-       get_udptl_info: ooh323_get_udptl_peer,
-       set_udptl_peer: ooh323_set_udptl_peer,
+       .type = "H323",
+       .get_udptl_info = ooh323_get_udptl_peer,
+       .set_udptl_peer = ooh323_set_udptl_peer,
 };
 
 

diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c
index 0e83e2883f33ea6d0d28ec5778c9d126be43c43a..03ef884c875c04ba4e4dcab2b17b3ea15785d012 100644 (file)
--- a/apps/app_externalivr.c
+++ b/apps/app_externalivr.c
@@ -293,9 +293,9 @@ static int gen_generate(struct ast_channel *chan, void *data, int len, int sampl
 
 static struct ast_generator gen =
 {
-       alloc: gen_alloc,
-       release: gen_release,
-       generate: gen_generate,
+       .alloc = gen_alloc,
+       .release = gen_release,
+       .generate = gen_generate,
 };
 
 static void ast_eivr_getvariable(struct ast_channel *chan, char *data, char *outbuf, int outbuflen)

diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c
index 72a800933d9302fc2384c3edb11b1daecc3c83a7..a093e974d282b7244581b1dde6da662d3754e735 100644 (file)
--- a/apps/app_milliwatt.c
+++ b/apps/app_milliwatt.c
@@ -117,9 +117,9 @@ static int milliwatt_generate(struct ast_channel *chan, void *data, int len, int
 }
 
 static struct ast_generator milliwattgen = {
-       alloc: milliwatt_alloc,
-       release: milliwatt_release,
-       generate: milliwatt_generate,
+       .alloc = milliwatt_alloc,
+       .release = milliwatt_release,
+       .generate = milliwatt_generate,
 };
 
 static int old_milliwatt_exec(struct ast_channel *chan)

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 1f724882e1178a3147f0fae40800f2631b971895..eee69ccfbcfb7e2920ae62594fd9928c8dd55586 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -14144,12 +14144,12 @@ static int iax2_devicestate(void *data)
 
 static struct ast_switch iax2_switch =
 {
-       name:        "IAX2",
-       description: "IAX Remote Dialplan Switch",
-       exists:      iax2_exists,
-       canmatch:    iax2_canmatch,
-       exec:        iax2_exec,
-       matchmore:   iax2_matchmore,
+       .name        = "IAX2",
+       .description = "IAX Remote Dialplan Switch",
+       .exists      = iax2_exists,
+       .canmatch    = iax2_canmatch,
+       .exec        = iax2_exec,
+       .matchmore   = iax2_matchmore,
 };
 
 /*

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 7cd8dd71a348c7060541366fa382d1d76b7a2671..36bbccfb602427e6dad96b258040b931455a6f9a 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3057,9 +3057,9 @@ static struct sip_registry *registry_addref(struct sip_registry *reg, char *tag)
 
 /*! \brief Interface structure with callbacks used to connect to UDPTL module*/
 static struct ast_udptl_protocol sip_udptl = {
-       type: "SIP",
-       get_udptl_info: sip_get_udptl_peer,
-       set_udptl_peer: sip_set_udptl_peer,
+       .type = "SIP",
+       .get_udptl_info = sip_get_udptl_peer,
+       .set_udptl_peer = sip_set_udptl_peer,
 };
 
 static void append_history_full(struct sip_pvt *p, const char *fmt, ...)

diff --git a/main/app.c b/main/app.c
index c6a176e650d1c38e52b37decbfc4c47c4f4303c8..79ae1ac64b9ab64a6908527a76d8c8d6528ff211 100644 (file)
--- a/main/app.c
+++ b/main/app.c
@@ -525,9 +525,9 @@ static void *linear_alloc(struct ast_channel *chan, void *params)
 
 static struct ast_generator linearstream =
 {
-       alloc: linear_alloc,
-       release: linear_release,
-       generate: linear_generator,
+       .alloc = linear_alloc,
+       .release = linear_release,
+       .generate = linear_generator,
 };
 
 int ast_linear_stream(struct ast_channel *chan, const char *filename, int fd, int allowoverride)

diff --git a/main/channel.c b/main/channel.c
index 807aeb78f55ef0c66bd684ac56aabb0590e0c3c9..7a3a997910b8209e99162042d3e18d56304eeed8 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -7930,9 +7930,9 @@ static int tonepair_generator(struct ast_channel *chan, void *data, int len, int
 }
 
 static struct ast_generator tonepair = {
-       alloc: tonepair_alloc,
-       release: tonepair_release,
-       generate: tonepair_generator,
+       .alloc = tonepair_alloc,
+       .release = tonepair_release,
+       .generate = tonepair_generator,
 };
 
 int ast_tonepair_start(struct ast_channel *chan, int freq1, int freq2, int duration, int vol)

diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c
index 915a0cb10a32ab1b5b8aa65e19f74519be09d72b..5f3561343496b93320f00d89d9faec1bded2613e 100644 (file)
--- a/pbx/pbx_loopback.c
+++ b/pbx/pbx_loopback.c
@@ -163,12 +163,12 @@ static int loopback_matchmore(struct ast_channel *chan, const char *context, con
 
 static struct ast_switch loopback_switch =
 {
-        name:                   "Loopback",
-        description:                   "Loopback Dialplan Switch",
-        exists:                 loopback_exists,
-        canmatch:               loopback_canmatch,
-        exec:                   loopback_exec,
-        matchmore:              loopback_matchmore,
+       .name                   = "Loopback",
+       .description            = "Loopback Dialplan Switch",
+       .exists                 = loopback_exists,
+       .canmatch               = loopback_canmatch,
+       .exec                   = loopback_exec,
+       .matchmore              = loopback_matchmore,
 };
 
 static int unload_module(void)

diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c
index e952f8f2f1dd3abd6880fd367224ff37d39d781b..82261b17976c6a9903302cdcde6d74b4c17316d0 100644 (file)
--- a/pbx/pbx_realtime.c
+++ b/pbx/pbx_realtime.c
@@ -388,12 +388,12 @@ static int realtime_matchmore(struct ast_channel *chan, const char *context, con
 
 static struct ast_switch realtime_switch =
 {
-        name:                   "Realtime",
-        description:                   "Realtime Dialplan Switch",
-        exists:                 realtime_exists,
-        canmatch:               realtime_canmatch,
-        exec:                   realtime_exec,
-        matchmore:              realtime_matchmore,
+       .name                   = "Realtime",
+       .description            = "Realtime Dialplan Switch",
+       .exists                 = realtime_exists,
+       .canmatch               = realtime_canmatch,
+       .exec                   = realtime_exec,
+       .matchmore              = realtime_matchmore,
 };
 
 static int unload_module(void)

diff --git a/res/res_fax_spandsp.c b/res/res_fax_spandsp.c
index ffbb8999d19e64b40266dccf18fd81d302c1f395..901ec48c04f570e94404bf27d0dfc1b3a1b61cdb 100644 (file)
--- a/res/res_fax_spandsp.c
+++ b/res/res_fax_spandsp.c
@@ -759,9 +759,9 @@ static int spandsp_fax_gateway_start(struct ast_fax_session *s) {
        int i;
        struct ast_channel *peer;
        static struct ast_generator t30_gen = {
-               alloc: spandsp_fax_gw_gen_alloc,
-               release: spandsp_fax_gw_gen_release,
-               generate: spandsp_fax_gw_t30_gen,
+               .alloc = spandsp_fax_gw_gen_alloc,
+               .release = spandsp_fax_gw_gen_release,
+               .generate = spandsp_fax_gw_t30_gen,
        };
 
 #if SPANDSP_RELEASE_DATE >= 20081012