From b2f17e5f62e43ab6fd07d8752d0fc27f89f8aa37 Mon Sep 17 00:00:00 2001 From: Axel Davy Date: Tue, 6 Dec 2016 22:24:53 +0100 Subject: [PATCH] st/nine: Silent warnings with guid_str In non-debug build, the variables are unused, and thus trigger a compilation warning. Signed-off-by: Axel Davy --- src/gallium/state_trackers/nine/iunknown.c | 8 ++++++++ src/gallium/state_trackers/nine/surface9.c | 2 ++ src/gallium/state_trackers/nine/volume9.c | 2 ++ 3 files changed, 12 insertions(+) diff --git a/src/gallium/state_trackers/nine/iunknown.c b/src/gallium/state_trackers/nine/iunknown.c index c0d2b0db019..28e475659f4 100644 --- a/src/gallium/state_trackers/nine/iunknown.c +++ b/src/gallium/state_trackers/nine/iunknown.c @@ -78,6 +78,8 @@ NineUnknown_QueryInterface( struct NineUnknown *This, DBG("This=%p riid=%p id=%s ppvObject=%p\n", This, riid, riid ? GUID_sprintf(guid_str, riid) : "", ppvObject); + (void)guid_str; + if (!ppvObject) return E_POINTER; do { @@ -164,6 +166,8 @@ NineUnknown_SetPrivateData( struct NineUnknown *This, DBG("This=%p GUID=%s pData=%p SizeOfData=%u Flags=%x\n", This, GUID_sprintf(guid_str, refguid), pData, SizeOfData, Flags); + (void)guid_str; + if (Flags & D3DSPD_IUNKNOWN) user_assert(SizeOfData == sizeof(IUnknown *), D3DERR_INVALIDCALL); @@ -213,6 +217,8 @@ NineUnknown_GetPrivateData( struct NineUnknown *This, DBG("This=%p GUID=%s pData=%p pSizeOfData=%p\n", This, GUID_sprintf(guid_str, refguid), pData, pSizeOfData); + (void)guid_str; + header = util_hash_table_get(This->pdata, refguid); if (!header) { return D3DERR_NOTFOUND; } @@ -243,6 +249,8 @@ NineUnknown_FreePrivateData( struct NineUnknown *This, DBG("This=%p GUID=%s\n", This, GUID_sprintf(guid_str, refguid)); + (void)guid_str; + header = util_hash_table_get(This->pdata, refguid); if (!header) return D3DERR_NOTFOUND; diff --git a/src/gallium/state_trackers/nine/surface9.c b/src/gallium/state_trackers/nine/surface9.c index a172a10d42d..54d07dca40a 100644 --- a/src/gallium/state_trackers/nine/surface9.c +++ b/src/gallium/state_trackers/nine/surface9.c @@ -285,6 +285,8 @@ NineSurface9_GetContainer( struct NineSurface9 *This, DBG("This=%p riid=%p id=%s ppContainer=%p\n", This, riid, riid ? GUID_sprintf(guid_str, riid) : "", ppContainer); + (void)guid_str; + if (!ppContainer) return E_POINTER; /* Return device for OffscreenPlainSurface, DepthStencilSurface and RenderTarget */ diff --git a/src/gallium/state_trackers/nine/volume9.c b/src/gallium/state_trackers/nine/volume9.c index a31dc0ad88e..33f7cf370c4 100644 --- a/src/gallium/state_trackers/nine/volume9.c +++ b/src/gallium/state_trackers/nine/volume9.c @@ -166,6 +166,8 @@ NineVolume9_GetContainer( struct NineVolume9 *This, DBG("This=%p riid=%p id=%s ppContainer=%p\n", This, riid, riid ? GUID_sprintf(guid_str, riid) : "", ppContainer); + (void)guid_str; + if (!NineUnknown(This)->container) return E_NOINTERFACE; return NineUnknown_QueryInterface(NineUnknown(This)->container, riid, ppContainer); -- 2.30.2