From: Jonathan Rose Date: Wed, 4 Apr 2012 16:29:18 +0000 (+0000) Subject: Replace GNU old-style field designator extensions to fix clang warnings X-Git-Tag: 1.8.12.0-rc1~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed76cdda72ccf02c1baf1fb3b609f550aaf31fad;p=thirdparty%2Fasterisk.git 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) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@361142 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c index 07c9cb7fed..9011fb5cd4 100644 --- a/addons/chan_ooh323.c +++ b/addons/chan_ooh323.c @@ -124,9 +124,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 13525fd962..b91fc5025e 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 30b3d51241..d54c3b5886 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 79ac1ae441..39950b1e82 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -14023,12 +14023,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 73e7e64acc..703f141e17 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3038,9 +3038,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 b48d2bfde4..77f5b35528 100644 --- a/main/app.c +++ b/main/app.c @@ -523,9 +523,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 28c3c4c3a9..ee1ff8c909 100644 --- a/main/channel.c +++ b/main/channel.c @@ -7706,9 +7706,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 48e4f876e0..fd8d9813fa 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)