From: Abramo Bagnara <abramo@alsa-project.org>
Date: Wed, 16 Aug 2000 16:05:57 +0000 (+0000)
Subject: private_free fixes
X-Git-Tag: v1.0.3~1180
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=2d0d68759151a145e5c91757551439dc02790350;p=alsa-lib.git

private_free fixes
---

diff --git a/include/pcm.h b/include/pcm.h
index 29df6a35..69e1e2ca 100644
--- a/include/pcm.h
+++ b/include/pcm.h
@@ -284,7 +284,7 @@ struct snd_stru_pcm_plugin {
 	snd_pcm_plugin_t *next;
 	snd_pcm_plug_t *plug;
 	void *private_data;
-	void (*private_free)(snd_pcm_plugin_t *plugin, void *private_data);
+	void (*private_free)(snd_pcm_plugin_t *plugin);
 	char *buf;
 	size_t buf_frames;
 	snd_pcm_plugin_channel_t *buf_channels;
diff --git a/src/pcm/pcm_common.c b/src/pcm/pcm_common.c
index b8ed0b01..ae947ecf 100644
--- a/src/pcm/pcm_common.c
+++ b/src/pcm/pcm_common.c
@@ -210,7 +210,7 @@ int snd_pcm_plugin_free(snd_pcm_plugin_t *plugin)
 {
 	assert(plugin);
 	if (plugin->private_free)
-		plugin->private_free(plugin, plugin->private_data);
+		plugin->private_free(plugin);
 	if (plugin->name)
 		free(plugin->name);
 	free(plugin->buf_channels);
diff --git a/src/pcm/plugin/mmap.c b/src/pcm/plugin/mmap.c
index d2742aa1..8fead5a8 100644
--- a/src/pcm/plugin/mmap.c
+++ b/src/pcm/plugin/mmap.c
@@ -258,7 +258,7 @@ static int mmap_action(snd_pcm_plugin_t *plugin,
 	return 0;	/* silenty ignore other actions */
 }
 
-static void mmap_free(snd_pcm_plugin_t *plugin, void *private_data ATTRIBUTE_UNUSED)
+static void mmap_free(snd_pcm_plugin_t *plugin)
 {
 	struct mmap_private_data *data;
 
diff --git a/src/pcm/plugin/route.c b/src/pcm/plugin/route.c
index 6a5447d4..448c47d8 100644
--- a/src/pcm/plugin/route.c
+++ b/src/pcm/plugin/route.c
@@ -410,7 +410,7 @@ int route_dst_channels_mask(snd_pcm_plugin_t *plugin,
 	return 0;
 }
 
-static void route_free(snd_pcm_plugin_t *plugin, void* private_data ATTRIBUTE_UNUSED)
+static void route_free(snd_pcm_plugin_t *plugin)
 {
 	route_t *data = (route_t *)plugin->extra_data;
 	unsigned int dst_channel;