Andrew Talbot : dmime: Dangling references fix.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: db299e3a3aa2711cb0d691ea101476db256825de
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=db299e3a3aa2711cb0d691ea10...

Author: Andrew Talbot 
Date:   Sat Dec  9 23:56:06 2006 +0000

dmime: Dangling references fix.

---

dlls/dmime/dmutils.c |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c
index 992a2d2..83ad57b 100644
--- a/dlls/dmime/dmutils.c
+++ b/dlls/dmime/dmutils.c
@@ -668,7 +668,7 @@ const char *debugstr_DMUS_CONTAINED_OBJF

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):\n", pDesc);
    	ptr += sprintf(ptr, " - dwSize = 0x%08X\n", pDesc->dwSize);
@@ -684,8 +684,7 @@ const char *debugstr_DMUS_OBJECTDESC (LP
    	                                                     wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData);
    	if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream);
    	
-		ptr = &buffer[0];
-		return ptr;
+		return wine_dbg_sprintf("%s", buffer);
    } else {
    	return wine_dbg_sprintf("(NULL)");
    }
@@ -713,13 +712,12 @@ void debug_DMUS_OBJECTDESC (LPDMUS_OBJEC

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):\n", pHeader);
    	ptr += sprintf(ptr, " - dwFlags = %s\n", debugstr_DMUS_CONTAINER_FLAGS(pHeader->dwFlags));
    	
-		ptr = &buffer[0];
-		return ptr;
+		return wine_dbg_sprintf("%s", buffer);
    } else {
    	return wine_dbg_sprintf("(NULL)");
    }
@@ -727,7 +725,7 @@ const char *debugstr_DMUS_IO_CONTAINER_H

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):\n", pHeader);
    	ptr += sprintf(ptr, " - guidClassID = %s\n", debugstr_dmguid(&pHeader->guidClassID));
@@ -735,8 +733,7 @@ const char *debugstr_DMUS_IO_CONTAINED_O
    	ptr += sprintf(ptr, " - ckid = %s\n", debugstr_fourcc (pHeader->ckid));
    	ptr += sprintf(ptr, " - fccType = %s\n", debugstr_fourcc (pHeader->fccType));

-		ptr = &buffer[0];
-		return ptr;
+		return wine_dbg_sprintf("%s", buffer);
    } else {
    	return wine_dbg_sprintf("(NULL)");
    }