From e6a0a09b88d28aa5aa49b5ff3fcfc07485831948 Mon Sep 17 00:00:00 2001 From: Andrew Talbot Date: Sun, 10 Dec 2006 17:11:27 +0000 Subject: [PATCH] dmloader: Dangling references fix. --- dlls/dmloader/debug.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 551e6d885e2..3d8b6cc9e8c 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -482,7 +482,7 @@ const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask) { const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc) { - char buffer[1024] = "", *ptr = &buffer[0]; + char buffer[1024], *ptr = buffer; ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):", pDesc); ptr += sprintf(ptr, "\n - dwSize = 0x%08X", pDesc->dwSize); @@ -498,8 +498,7 @@ const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, "\n - pStream = %p", pDesc->pStream); - ptr = &buffer[0]; - return ptr; + return wine_dbg_sprintf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); } @@ -507,13 +506,12 @@ const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader) { if (pHeader) { - char buffer[1024] = "", *ptr = &buffer[0]; + char buffer[1024], *ptr = buffer; ptr += sprintf(ptr, "DMUS_IO_CONTAINER_HEADER (%p):", pHeader); ptr += sprintf(ptr, "\n - dwFlags = %s", debugstr_DMUS_CONTAINER_FLAGS(pHeader->dwFlags)); - ptr = &buffer[0]; - return ptr; + return wine_dbg_sprintf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); } @@ -521,7 +519,7 @@ const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeade const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT_HEADER pHeader) { if (pHeader) { - char buffer[1024] = "", *ptr = &buffer[0]; + char buffer[1024], *ptr = buffer; ptr += sprintf(ptr, "DMUS_IO_CONTAINED_OBJECT_HEADER (%p):", pHeader); ptr += sprintf(ptr, "\n - guidClassID = %s", debugstr_dmguid(&pHeader->guidClassID)); @@ -529,8 +527,7 @@ const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT ptr += sprintf(ptr, "\n - ckid = %s", debugstr_fourcc (pHeader->ckid)); ptr += sprintf(ptr, "\n - fccType = %s", debugstr_fourcc (pHeader->fccType)); - ptr = &buffer[0]; - return ptr; + return wine_dbg_sprintf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); } -- 2.11.4.GIT