mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-02 20:08:17 +00:00
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
This commit is contained in:
@@ -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,
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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,
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
@@ -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, ...)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user