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 07c9cb7fed079f4d9fe6de29d32d45135ff5de76..9011fb5cd45355e31097d238176506e75418ebcc 100644 (file)
--- 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 13525fd9626b4b12efb8454ad8e44d3543a8754e..b91fc5025ec292905e6a4baeaed6d6364a1957c3 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 30b3d51241ab03a3211d2ff5d13162c707559c60..d54c3b5886fcab7d2e946e720a63e3f58349a5f6 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 79ac1ae441bcf330691b4611f93e35a5c93aebe8..39950b1e82d1de3523cb45e007119bab561241c6 100644 (file)
--- 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 73e7e64accdc84704a8bd0ed1615d0dd7e8d5784..703f141e17dc09ec71eccd18efd0b30ef0b59d7b 100644 (file)
--- 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 b48d2bfde45e464d28ae207cde0ab5585c061cab..77f5b355288fec933180059fccf33ff2a7a1ad03 100644 (file)
--- 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 28c3c4c3a9d8eb31907e5d7eb7636fd0be22cfde..ee1ff8c909cb47893bfd4c27ef8c4559c2c0aac4 100644 (file)
--- 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 48e4f876e06f4ffa81f4ab58ff97d6ee1c3a106a..fd8d9813fa155a15938b929cba53f95668f573a6 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)