summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Rose <jrose@digium.com>2012-04-04 18:08:28 +0000
committerJonathan Rose <jrose@digium.com>2012-04-04 18:08:28 +0000
commite96a59acfdbd655045ad8d8292cde674d2236645 (patch)
tree0adb9e4b51d96b070321db626eea3fd506d04079
parent97b2fa8de18777eb31f20e86dd1c31ffa3a0f17b (diff)
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) ........ Merged revisions 361143 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@361155 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--addons/chan_ooh323.c6
-rw-r--r--apps/app_externalivr.c6
-rw-r--r--apps/app_milliwatt.c6
-rw-r--r--channels/chan_iax2.c12
-rw-r--r--channels/chan_sip.c6
-rw-r--r--main/app.c6
-rw-r--r--main/channel.c6
-rw-r--r--pbx/pbx_loopback.c12
-rw-r--r--pbx/pbx_realtime.c12
-rw-r--r--res/res_fax_spandsp.c6
10 files changed, 39 insertions, 39 deletions
diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c
index f229e8693..c395d9084 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 5a320002b..d9aaf67a9 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 75d8037d6..a4adc08c5 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 3928ed842..cbc4858ac 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -14036,12 +14036,12 @@ static int iax2_devicestate(const char *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 f9fa5512e..f46daf707 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3060,9 +3060,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 bb6a9bd62..0634bb819 100644
--- a/main/app.c
+++ b/main/app.c
@@ -578,9 +578,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 b86cd5252..5f549f379 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -7714,9 +7714,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 915a0cb10..5f3561343 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 cc8bfc503..fb2f41320 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 ffbb8999d..901ec48c0 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