[asterisk-commits] jrose: trunk r361155 - in /trunk: ./ addons/ apps/ channels/ main/ pbx/ res/

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Apr 4 13:08:34 CDT 2012


Author: jrose
Date: Wed Apr  4 13:08:28 2012
New Revision: 361155

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=361155
Log:
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

Modified:
    trunk/   (props changed)
    trunk/addons/chan_ooh323.c
    trunk/apps/app_externalivr.c
    trunk/apps/app_milliwatt.c
    trunk/channels/chan_iax2.c
    trunk/channels/chan_sip.c
    trunk/main/app.c
    trunk/main/channel.c
    trunk/pbx/pbx_loopback.c
    trunk/pbx/pbx_realtime.c
    trunk/res/res_fax_spandsp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/chan_ooh323.c?view=diff&rev=361155&r1=361154&r2=361155
==============================================================================
--- trunk/addons/chan_ooh323.c (original)
+++ trunk/addons/chan_ooh323.c Wed Apr  4 13:08:28 2012
@@ -129,9 +129,9 @@
 };
 
 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,
 };
 
 

Modified: trunk/apps/app_externalivr.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_externalivr.c?view=diff&rev=361155&r1=361154&r2=361155
==============================================================================
--- trunk/apps/app_externalivr.c (original)
+++ trunk/apps/app_externalivr.c Wed Apr  4 13:08:28 2012
@@ -293,9 +293,9 @@
 
 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)

Modified: trunk/apps/app_milliwatt.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_milliwatt.c?view=diff&rev=361155&r1=361154&r2=361155
==============================================================================
--- trunk/apps/app_milliwatt.c (original)
+++ trunk/apps/app_milliwatt.c Wed Apr  4 13:08:28 2012
@@ -117,9 +117,9 @@
 }
 
 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)

Modified: trunk/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=361155&r1=361154&r2=361155
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Wed Apr  4 13:08:28 2012
@@ -14036,12 +14036,12 @@
 
 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,
 };
 
 /*

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=361155&r1=361154&r2=361155
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Apr  4 13:08:28 2012
@@ -3060,9 +3060,9 @@
 
 /*! \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, ...)

Modified: trunk/main/app.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/app.c?view=diff&rev=361155&r1=361154&r2=361155
==============================================================================
--- trunk/main/app.c (original)
+++ trunk/main/app.c Wed Apr  4 13:08:28 2012
@@ -578,9 +578,9 @@
 
 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)

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=361155&r1=361154&r2=361155
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Wed Apr  4 13:08:28 2012
@@ -7714,9 +7714,9 @@
 }
 
 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)

Modified: trunk/pbx/pbx_loopback.c
URL: http://svnview.digium.com/svn/asterisk/trunk/pbx/pbx_loopback.c?view=diff&rev=361155&r1=361154&r2=361155
==============================================================================
--- trunk/pbx/pbx_loopback.c (original)
+++ trunk/pbx/pbx_loopback.c Wed Apr  4 13:08:28 2012
@@ -163,12 +163,12 @@
 
 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)

Modified: trunk/pbx/pbx_realtime.c
URL: http://svnview.digium.com/svn/asterisk/trunk/pbx/pbx_realtime.c?view=diff&rev=361155&r1=361154&r2=361155
==============================================================================
--- trunk/pbx/pbx_realtime.c (original)
+++ trunk/pbx/pbx_realtime.c Wed Apr  4 13:08:28 2012
@@ -388,12 +388,12 @@
 
 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)

Modified: trunk/res/res_fax_spandsp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_fax_spandsp.c?view=diff&rev=361155&r1=361154&r2=361155
==============================================================================
--- trunk/res/res_fax_spandsp.c (original)
+++ trunk/res/res_fax_spandsp.c Wed Apr  4 13:08:28 2012
@@ -759,9 +759,9 @@
 	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




More information about the asterisk-commits mailing list