From a26e36a03dc7906b8578c9d3d2fb14ba74d52d6a Mon Sep 17 00:00:00 2001 From: Jonathan Rose Date: Wed, 4 Apr 2012 16:38:12 +0000 Subject: [PATCH] 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 --- addons/chan_ooh323.c | 6 +++--- apps/app_externalivr.c | 6 +++--- apps/app_milliwatt.c | 6 +++--- channels/chan_iax2.c | 12 ++++++------ channels/chan_sip.c | 6 +++--- main/app.c | 6 +++--- main/channel.c | 6 +++--- pbx/pbx_loopback.c | 12 ++++++------ pbx/pbx_realtime.c | 12 ++++++------ res/res_fax_spandsp.c | 6 +++--- 10 files changed, 39 insertions(+), 39 deletions(-) diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c index 1b7525ef9b..f9ee8f9977 100644 --- 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 0e83e2883f..03ef884c87 100644 --- 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 72a800933d..a093e974d2 100644 --- 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 1f724882e1..eee69ccfbc 100644 --- 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 7cd8dd71a3..36bbccfb60 100644 --- 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 c6a176e650..79ae1ac64b 100644 --- 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 807aeb78f5..7a3a997910 100644 --- 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 915a0cb10a..5f35613434 100644 --- 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 e952f8f2f1..82261b1797 100644 --- 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 ffbb8999d1..901ec48c04 100644 --- 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 -- 2.47.2