From: Abramo Bagnara <abramo@alsa-project.org>
Date: Sun, 11 Jun 2000 13:31:46 +0000 (+0000)
Subject: Removed memcpy use
X-Git-Tag: v1.0.3~1232
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=c956c5a0244ca4a543e08ffeb0aca59a16960bc2;p=alsa-lib.git

Removed memcpy use
---

diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
index a6083a13..0ce3a349 100644
--- a/src/pcm/pcm.c
+++ b/src/pcm/pcm.c
@@ -165,12 +165,12 @@ int snd_pcm_stream_setup(snd_pcm_t *pcm, snd_pcm_stream_setup_t *setup)
 	str = &pcm->stream[setup->stream];
 	assert(str->open);
 	if (str->valid_setup) {
-		memcpy(setup, &str->setup, sizeof(*setup));
+		*setup = str->setup;
 		return 0;
 	}
-	if ((err = pcm->ops->stream_setup(pcm, setup)) < 0)
+	if ((err = pcm->ops->stream_setup(pcm, &str->setup)) < 0)
 		return err;
-	memcpy(&str->setup, setup, sizeof(*setup));
+	*setup = str->setup;
 	str->bits_per_sample = snd_pcm_format_physical_width(setup->format.format);
         str->bits_per_frame = str->bits_per_sample * setup->format.channels;
 	str->valid_setup = 1;
diff --git a/src/pcm/pcm_common.c b/src/pcm/pcm_common.c
index 6885f7cd..01f7458f 100644
--- a/src/pcm/pcm_common.c
+++ b/src/pcm/pcm_common.c
@@ -139,10 +139,10 @@ int snd_pcm_plugin_build(snd_pcm_plugin_handle_t *handle,
 	plugin->name = name ? strdup(name) : NULL;
 	plugin->handle = handle;
 	plugin->stream = stream;
-	memcpy(&plugin->src_format, src_format, sizeof(snd_pcm_format_t));
+	plugin->src_format = *src_format;
 	plugin->src_width = snd_pcm_format_physical_width(src_format->format);
 	assert(plugin->src_width > 0);
-	memcpy(&plugin->dst_format, dst_format, sizeof(snd_pcm_format_t));
+	plugin->dst_format = *dst_format;
 	plugin->dst_width = snd_pcm_format_physical_width(dst_format->format);
 	assert(plugin->dst_width > 0);
 	plugin->src_channels = calloc(src_format->channels, sizeof(snd_pcm_plugin_channel_t));
@@ -298,7 +298,7 @@ int snd_pcm_plug_slave_params(snd_pcm_stream_params_t *params,
 			      snd_pcm_stream_info_t *slave_info,
 			      snd_pcm_stream_params_t *slave_params)
 {
-	memcpy(slave_params, params, sizeof(*slave_params));
+	*slave_params = *params;
 	if ((slave_info->formats & (1 << params->format.format)) == 0) {
 		int format = params->format.format;
 		if ((snd_pcm_plug_formats(slave_info->formats) & (1 << format)) == 0)
@@ -392,20 +392,20 @@ int snd_pcm_plug_format(snd_pcm_plugin_handle_t *handle,
 	
 	switch (params->stream) {
 	case SND_PCM_STREAM_PLAYBACK:
-		memcpy(&dstparams, slave_params, sizeof(*slave_params));
+		dstparams = *slave_params;
 		srcparams = slave_params;
-		memcpy(srcparams, params, sizeof(*params));
+		*srcparams = *params;
 		break;
 	case SND_PCM_STREAM_CAPTURE:
-		memcpy(&dstparams, params, sizeof(*params));
+		dstparams = *params;
 		srcparams = params;
-		memcpy(srcparams, slave_params, sizeof(*slave_params));
+		*srcparams = *slave_params;
 		break;
 	default:
 		assert(0);
 		return -EINVAL;
 	}
-	memcpy(&tmpparams, srcparams, sizeof(*srcparams));
+	tmpparams = *srcparams;
 		
 	pdprintf("srcparams: interleave=%i, format=%i, rate=%i, channels=%i\n", 
 		 srcparams->format.interleave,
diff --git a/src/pcm/pcm_plug.c b/src/pcm/pcm_plug.c
index 8ff03b3c..8cc74651 100644
--- a/src/pcm/pcm_plug.c
+++ b/src/pcm/pcm_plug.c
@@ -357,7 +357,7 @@ static int snd_pcm_plug_stream_params(snd_pcm_t *pcm, snd_pcm_stream_params_t *p
 	snd_pcm_plug_clear(pcm, stream);
 
 	/* add necessary plugins */
-	memcpy(&params1, params, sizeof(*params));
+	params1 = *params;
 	if ((err = snd_pcm_plug_format(pcm, &params1, &slave_params)) < 0)
 		return err;