From: divverent Date: Fri, 18 May 2007 21:11:39 +0000 (+0000) Subject: more of these X-Git-Tag: xonotic-v0.1.0preview~3140 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b567e6b27ee4224ea24b0f5df2c0a077a3c3b637;p=xonotic%2Fdarkplaces.git more of these git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7315 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/snd_alsa.c b/snd_alsa.c index a1d0c262..bed25d2b 100644 --- a/snd_alsa.c +++ b/snd_alsa.c @@ -63,7 +63,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested) if (suggested != NULL) { - memcpy (suggested, requested, sizeof (suggested)); + memcpy (suggested, requested, sizeof (*suggested)); if (requested->width < 1) suggested->width = 1; diff --git a/snd_oss.c b/snd_oss.c index c3a67aaf..c991516b 100644 --- a/snd_oss.c +++ b/snd_oss.c @@ -61,7 +61,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested) if (suggested != NULL) { - memcpy(suggested, requested, sizeof(suggested)); + memcpy(suggested, requested, sizeof(*suggested)); if (requested->width < 1) suggested->width = 1; @@ -116,7 +116,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested) { if (ioctl_param != prev_value && suggested != NULL) { - memcpy(suggested, requested, sizeof(suggested)); + memcpy(suggested, requested, sizeof(*suggested)); if (ioctl_param == AFMT_S16_NE) suggested->width = 2; @@ -137,7 +137,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested) { if (ioctl_param != requested->channels && suggested != NULL) { - memcpy(suggested, requested, sizeof(suggested)); + memcpy(suggested, requested, sizeof(*suggested)); suggested->channels = ioctl_param; } @@ -154,7 +154,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested) { if ((unsigned int)ioctl_param != requested->speed && suggested != NULL) { - memcpy(suggested, requested, sizeof(suggested)); + memcpy(suggested, requested, sizeof(*suggested)); suggested->speed = ioctl_param; }