Skip to contentSkip to conversation

Replace obsolete GCC initializer syntax [3/3]

PATCH New Art Haas 1 participant 1 message Jul 17, 2003

lore
Share & tools
lore

Art Haas

author
#0 lore raw

PATCH 1/1 Replace obsolete GCC initializer syntax [3/3]

Hi.

Here's the third patch.

Index: alsa-lib/src/pcm/pcm_plug.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_plug.c,v retrieving revision 1.122

src/pcm/pcm_plug.c +12 -13
diff -u -u -r1.122 pcm_plug.c
@@ -955,19 +955,18 @@
 }
 
 static snd_pcm_ops_t snd_pcm_plug_ops = {
-	close: snd_pcm_plug_close,
-	info: snd_pcm_plug_info,
-	hw_refine: snd_pcm_plug_hw_refine,
-	hw_params: snd_pcm_plug_hw_params,
-	hw_free: snd_pcm_plug_hw_free,
-	sw_params: snd_pcm_plug_sw_params,
-	channel_info: snd_pcm_plug_channel_info,
-	dump: snd_pcm_plug_dump,
-	nonblock: snd_pcm_plug_nonblock,
-	async: snd_pcm_plug_async,
-	poll_revents: snd_pcm_plug_poll_revents,
-	mmap: snd_pcm_plug_mmap,
-	munmap: snd_pcm_plug_munmap,
+	.close 		= snd_pcm_plug_close,
+	.info 		= snd_pcm_plug_info,
+	.hw_refine 	= snd_pcm_plug_hw_refine,
+	.hw_params 	= snd_pcm_plug_hw_params,
+	.hw_free 	= snd_pcm_plug_hw_free,
+	.sw_params 	= snd_pcm_plug_sw_params,
+	.channel_info 	= snd_pcm_plug_channel_info,
+	.dump 		= snd_pcm_plug_dump,
+	.nonblock 	= snd_pcm_plug_nonblock,
+	.async 		= snd_pcm_plug_async,
+	.mmap 		= snd_pcm_plug_mmap,
+	.munmap 	= snd_pcm_plug_munmap,
 };
 
 /**

Index: alsa-lib/src/pcm/pcm_plugin.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_plugin.c,v retrieving revision 1.90

src/pcm/pcm_plugin.c +18 -19
diff -u -u -r1.90 pcm_plugin.c
@@ -646,25 +646,24 @@
 }
 
 snd_pcm_fast_ops_t snd_pcm_plugin_fast_ops = {
-	status: snd_pcm_plugin_status,
-	state: snd_pcm_plugin_state,
-	hwsync: snd_pcm_plugin_hwsync,
-	delay: snd_pcm_plugin_delay,
-	prepare: snd_pcm_plugin_prepare,
-	reset: snd_pcm_plugin_reset,
-	start: snd_pcm_plugin_start,
-	drop: snd_pcm_plugin_drop,
-	drain: snd_pcm_plugin_drain,
-	pause: snd_pcm_plugin_pause,
-	rewind: snd_pcm_plugin_rewind,
-	forward: snd_pcm_plugin_forward,
-	resume: snd_pcm_plugin_resume,
-	writei: snd_pcm_plugin_writei,
-	writen: snd_pcm_plugin_writen,
-	readi: snd_pcm_plugin_readi,
-	readn: snd_pcm_plugin_readn,
-	avail_update: snd_pcm_plugin_avail_update,
-	mmap_commit: snd_pcm_plugin_mmap_commit,
+	.status 	= snd_pcm_plugin_status,
+	.state 		= snd_pcm_plugin_state,
+	.hwsync 	= snd_pcm_plugin_hwsync,
+	.delay 		= snd_pcm_plugin_delay,
+	.prepare 	= snd_pcm_plugin_prepare,
+	.reset 		= snd_pcm_plugin_reset,
+	.start 		= snd_pcm_plugin_start,
+	.drop 		= snd_pcm_plugin_drop,
+	.drain 		= snd_pcm_plugin_drain,
+	.pause 		= snd_pcm_plugin_pause,
+	.rewind 	= snd_pcm_plugin_rewind,
+	.resume 	= snd_pcm_plugin_resume,
+	.writei 	= snd_pcm_plugin_writei,
+	.writen 	= snd_pcm_plugin_writen,
+	.readi 		= snd_pcm_plugin_readi,
+	.readn 		= snd_pcm_plugin_readn,
+	.avail_update 	= snd_pcm_plugin_avail_update,
+	.mmap_commit 	= snd_pcm_plugin_mmap_commit,
 };
 
 

Index: alsa-lib/src/pcm/pcm_rate.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_rate.c,v retrieving revision 1.71

src/pcm/pcm_rate.c +12 -13
diff -u -u -r1.71 pcm_rate.c
@@ -568,19 +568,18 @@
 }
 
 static snd_pcm_ops_t snd_pcm_rate_ops = {
-	close: snd_pcm_plugin_close,
-	info: snd_pcm_plugin_info,
-	hw_refine: snd_pcm_rate_hw_refine,
-	hw_params: snd_pcm_rate_hw_params,
-	hw_free: snd_pcm_rate_hw_free,
-	sw_params: snd_pcm_rate_sw_params,
-	channel_info: snd_pcm_plugin_channel_info,
-	dump: snd_pcm_rate_dump,
-	nonblock: snd_pcm_plugin_nonblock,
-	async: snd_pcm_plugin_async,
-	poll_revents: snd_pcm_plugin_poll_revents,
-	mmap: snd_pcm_plugin_mmap,
-	munmap: snd_pcm_plugin_munmap,
+	.close 		= snd_pcm_plugin_close,
+	.info 		= snd_pcm_plugin_info,
+	.hw_refine 	= snd_pcm_rate_hw_refine,
+	.hw_params 	= snd_pcm_rate_hw_params,
+	.hw_free 	= snd_pcm_rate_hw_free,
+	.sw_params 	= snd_pcm_rate_sw_params,
+	.channel_info 	= snd_pcm_plugin_channel_info,
+	.dump 		= snd_pcm_rate_dump,
+	.nonblock 	= snd_pcm_plugin_nonblock,
+	.async 		= snd_pcm_plugin_async,
+	.mmap 		= snd_pcm_plugin_mmap,
+	.munmap 	= snd_pcm_plugin_munmap,
 };
 
 

Index: alsa-lib/src/pcm/pcm_route.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_route.c,v retrieving revision 1.72

src/pcm/pcm_route.c +12 -13
diff -u -u -r1.72 pcm_route.c
@@ -722,19 +722,18 @@
 }
 
 static snd_pcm_ops_t snd_pcm_route_ops = {
-	close: snd_pcm_route_close,
-	info: snd_pcm_plugin_info,
-	hw_refine: snd_pcm_route_hw_refine,
-	hw_params: snd_pcm_route_hw_params,
-	hw_free: snd_pcm_plugin_hw_free,
-	sw_params: snd_pcm_plugin_sw_params,
-	channel_info: snd_pcm_plugin_channel_info,
-	dump: snd_pcm_route_dump,
-	nonblock: snd_pcm_plugin_nonblock,
-	async: snd_pcm_plugin_async,
-	poll_revents: snd_pcm_plugin_poll_revents,
-	mmap: snd_pcm_plugin_mmap,
-	munmap: snd_pcm_plugin_munmap,
+	.close 		= snd_pcm_route_close,
+	.info 		= snd_pcm_plugin_info,
+	.hw_refine 	= snd_pcm_route_hw_refine,
+	.hw_params 	= snd_pcm_route_hw_params,
+	.hw_free 	= snd_pcm_plugin_hw_free,
+	.sw_params 	= snd_pcm_plugin_sw_params,
+	.channel_info 	= snd_pcm_plugin_channel_info,
+	.dump 		= snd_pcm_route_dump,
+	.nonblock 	= snd_pcm_plugin_nonblock,
+	.async 		= snd_pcm_plugin_async,
+	.mmap 		= snd_pcm_plugin_mmap,
+	.munmap 	= snd_pcm_plugin_munmap,
 };
 
 static int route_load_ttable(snd_pcm_route_params_t *params, snd_pcm_stream_t stream,

Index: alsa-lib/src/pcm/pcm_share.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_share.c,v retrieving revision 1.75

src/pcm/pcm_share.c +30 -31

70 lines not on this page · raw message

Index: alsa-lib/src/pcm/pcm_shm.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_shm.c,v retrieving revision 1.57

src/pcm/pcm_shm.c +30 -31

70 lines not on this page · raw message

Index: alsa-lib/src/pcm/scopes/level.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/scopes/level.c,v retrieving revision 1.5

src/pcm/scopes/level.c +7 -7
diff -u -u -r1.5 level.c
@@ -170,13 +170,13 @@
 }
 
 snd_pcm_scope_ops_t level_ops = {
-	enable: level_enable,
-	disable: level_disable,
-	close: level_close,
-	start: level_start,
-	stop: level_stop,
-	update: level_update,
-	reset: level_reset,
+	.enable 	= level_enable,
+	.disable 	= level_disable,
+	.close 		= level_close,
+	.start 		= level_start,
+	.stop 		= level_stop,
+	.update 	= level_update,
+	.reset 		= level_reset,
 };
 
 int snd_pcm_scope_level_open(snd_pcm_t *pcm, const char *name,

Index: alsa-lib/src/rawmidi/rawmidi_hw.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/rawmidi/rawmidi_hw.c,v retrieving revision 1.26

src/rawmidi/rawmidi_hw.c +9 -9
diff -u -u -r1.26 rawmidi_hw.c
@@ -153,15 +153,15 @@
 }
 
 snd_rawmidi_ops_t snd_rawmidi_hw_ops = {
-	close: snd_rawmidi_hw_close,
-	nonblock: snd_rawmidi_hw_nonblock,
-	info: snd_rawmidi_hw_info,
-	params: snd_rawmidi_hw_params,
-	status: snd_rawmidi_hw_status,
-	drop: snd_rawmidi_hw_drop,
-	drain: snd_rawmidi_hw_drain,
-	write: snd_rawmidi_hw_write,
-	read: snd_rawmidi_hw_read,
+	.close 		= snd_rawmidi_hw_close,
+	.nonblock 	= snd_rawmidi_hw_nonblock,
+	.info 		= snd_rawmidi_hw_info,
+	.params 	= snd_rawmidi_hw_params,
+	.status 	= snd_rawmidi_hw_status,
+	.drop 		= snd_rawmidi_hw_drop,
+	.drain 		= snd_rawmidi_hw_drain,
+	.write 		= snd_rawmidi_hw_write,
+	.read 		= snd_rawmidi_hw_read,
 };
 
 

Index: alsa-lib/src/seq/seq_hw.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/seq/seq_hw.c,v retrieving revision 1.20

src/seq/seq_hw.c +32 -32

70 lines not on this page · raw message

Index: alsa-lib/src/timer/timer_hw.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/timer/timer_hw.c,v retrieving revision 1.11

src/timer/timer_hw.c +9 -10
diff -u -u -r1.11 timer_hw.c
@@ -188,16 +188,15 @@
 }
 
 static snd_timer_ops_t snd_timer_hw_ops = {
-	.close = snd_timer_hw_close,
-	.nonblock = snd_timer_hw_nonblock,
-	.async = snd_timer_hw_async,
-	.info = snd_timer_hw_info,
-	.params = snd_timer_hw_params,
-	.status = snd_timer_hw_status,
-	.rt_start = snd_timer_hw_start,
-	.rt_stop = snd_timer_hw_stop,
-	.rt_continue = snd_timer_hw_continue,
-	.read = snd_timer_hw_read,
+	.close 		= snd_timer_hw_close,
+	.nonblock 	= snd_timer_hw_nonblock,
+	.info 		= snd_timer_hw_info,
+	.params 	= snd_timer_hw_params,
+	.status 	= snd_timer_hw_status,
+	.rt_start 	= snd_timer_hw_start,
+	.rt_stop 	= snd_timer_hw_stop,
+	.rt_continue 	= snd_timer_hw_continue,
+	.read 		= snd_timer_hw_read,
 };
 
 int snd_timer_hw_open(snd_timer_t **handle, const char *name, int dev_class, int dev_sclass, int card, int device, int subdevice, int mode)

Index: alsa-lib/src/timer/timer_query_hw.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/timer/timer_query_hw.c,v retrieving revision 1.6

src/timer/timer_query_hw.c +5 -5
diff -u -u -r1.6 timer_query_hw.c
@@ -82,11 +82,11 @@
 }
 
 static snd_timer_query_ops_t snd_timer_query_hw_ops = {
-	close: snd_timer_query_hw_close,
-	next_device: snd_timer_query_hw_next_device,
-	info: snd_timer_query_hw_info,
-	params: snd_timer_query_hw_params,
-	status: snd_timer_query_hw_status
+	.close		= snd_timer_query_hw_close,
+	.next_device	= snd_timer_query_hw_next_device,
+	.info		= snd_timer_query_hw_info,
+	.params		= snd_timer_query_hw_params,
+	.status		= snd_timer_query_hw_status,
 };
 
 int snd_timer_query_hw_open(snd_timer_query_t **handle, const char *name, int mode)
Signature · 11 lines
Man once surrendering his reason, has no remaining guard against absurdities
the most monstrous, and like a ship without rudder, is the sport of every wind.

-Thomas Jefferson to James Smith, 1822


-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines at the
same time. Free trial click here: http://www.vmware.com/wl/offer/345/0