Alexandre Julliard : dsound: Don'
t use sizeof in traces to avoid printf format warnings.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Jun 14 06:50:47 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: bc99ac09d3c0d87ba95f7163737898a18dd5624a
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bc99ac09d3c0d87ba95f7163737898a18dd5624a
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Jun 13 14:10:32 2006 +0200
dsound: Don't use sizeof in traces to avoid printf format warnings.
---
dlls/dsound/buffer.c | 2 +-
dlls/dsound/capture.c | 6 ++----
dlls/dsound/dsound.c | 3 +--
dlls/dsound/primary.c | 2 +-
dlls/dsound/sound3d.c | 7 +++----
5 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
index 0fa98b2..13b6b33 100644
--- a/dlls/dsound/buffer.c
+++ b/dlls/dsound/buffer.c
@@ -873,7 +873,7 @@ static HRESULT WINAPI IDirectSoundBuffer
}
if (caps->dwSize < sizeof(*caps)) {
- WARN("invalid parameter: caps->dwSize = %ld < %d\n",caps->dwSize, sizeof(*caps));
+ WARN("invalid parameter: caps->dwSize = %ld\n",caps->dwSize);
return DSERR_INVALIDPARAM;
}
diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c
index b1cef59..8a46a18 100644
--- a/dlls/dsound/capture.c
+++ b/dlls/dsound/capture.c
@@ -508,8 +508,7 @@ HRESULT WINAPI IDirectSoundCaptureImpl_G
}
if (lpDSCCaps->dwSize < sizeof(*lpDSCCaps)) {
- WARN("invalid parameter: lpDSCCaps->dwSize = %ld < %d\n",
- lpDSCCaps->dwSize, sizeof(*lpDSCCaps));
+ WARN("invalid parameter: lpDSCCaps->dwSize = %ld\n", lpDSCCaps->dwSize);
return DSERR_INVALIDPARAM;
}
@@ -816,8 +815,7 @@ IDirectSoundCaptureBufferImpl_GetCaps(
}
if (lpDSCBCaps->dwSize < sizeof(DSCBCAPS)) {
- WARN("invalid parameter: lpDSCBCaps->dwSize = %ld < %d\n",
- lpDSCBCaps->dwSize, sizeof(DSCBCAPS));
+ WARN("invalid parameter: lpDSCBCaps->dwSize = %ld\n", lpDSCBCaps->dwSize);
return DSERR_INVALIDPARAM;
}
diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
index 25715dd..52faf5d 100644
--- a/dlls/dsound/dsound.c
+++ b/dlls/dsound/dsound.c
@@ -1239,8 +1239,7 @@ HRESULT DirectSoundDevice_GetCaps(
/* check if there is enough room */
if (lpDSCaps->dwSize < sizeof(*lpDSCaps)) {
- WARN("invalid parameter: lpDSCaps->dwSize = %ld < %d\n",
- lpDSCaps->dwSize, sizeof(*lpDSCaps));
+ WARN("invalid parameter: lpDSCaps->dwSize = %ld\n", lpDSCaps->dwSize);
return DSERR_INVALIDPARAM;
}
diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
index 8faa38c..5a91bea 100644
--- a/dlls/dsound/primary.c
+++ b/dlls/dsound/primary.c
@@ -938,7 +938,7 @@ static HRESULT WINAPI PrimaryBufferImpl_
}
if (caps->dwSize < sizeof(*caps)) {
- WARN("invalid parameter: caps->dwSize = %ld: < %d\n", caps->dwSize, sizeof(*caps));
+ WARN("invalid parameter: caps->dwSize = %ld\n", caps->dwSize);
return DSERR_INVALIDPARAM;
}
diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c
index f0c2483..72fbc59 100644
--- a/dlls/dsound/sound3d.c
+++ b/dlls/dsound/sound3d.c
@@ -400,7 +400,7 @@ static HRESULT WINAPI IDirectSound3DBuff
}
if (lpDs3dBuffer->dwSize < sizeof(*lpDs3dBuffer)) {
- WARN("invalid parameter: lpDs3dBuffer->dwSize = %ld < %d\n",lpDs3dBuffer->dwSize, sizeof(*lpDs3dBuffer));
+ WARN("invalid parameter: lpDs3dBuffer->dwSize = %ld\n",lpDs3dBuffer->dwSize);
return DSERR_INVALIDPARAM;
}
@@ -516,8 +516,7 @@ static HRESULT WINAPI IDirectSound3DBuff
}
if (lpcDs3dBuffer->dwSize != sizeof(DS3DBUFFER)) {
- WARN("invalid parameter: lpcDs3dBuffer->dwSize = %ld != %d\n",
- lpcDs3dBuffer->dwSize, sizeof(DS3DBUFFER));
+ WARN("invalid parameter: lpcDs3dBuffer->dwSize = %ld\n", lpcDs3dBuffer->dwSize);
return status;
}
@@ -835,7 +834,7 @@ static HRESULT WINAPI IDirectSound3DList
}
if (lpDS3DL->dwSize < sizeof(*lpDS3DL)) {
- WARN("invalid parameter: lpDS3DL->dwSize = %ld < %d\n",lpDS3DL->dwSize, sizeof(*lpDS3DL));
+ WARN("invalid parameter: lpDS3DL->dwSize = %ld\n",lpDS3DL->dwSize);
return DSERR_INVALIDPARAM;
}
More information about the wine-cvs
mailing list