Henri Verbeet : wineoss.drv: Use wine_dbg_sprintf() in a few debug utility functions.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Mon Nov 30 10:22:10 2009 +0100

wineoss.drv: Use wine_dbg_sprintf() in a few debug utility functions.

---

dlls/wineoss.drv/audio.c |    8 ++------
 dlls/wineoss.drv/mixer.c |   20 +++++---------------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c
index 98575f1..cd89cb7 100644
--- a/dlls/wineoss.drv/audio.c
+++ b/dlls/wineoss.drv/audio.c
@@ -107,7 +107,6 @@ unsigned        numInDev;
 /* These strings used only for tracing */
 static const char * getCmdString(enum win_wm_message msg)
 {
-    static char unknown[32];
 #define MSG_TO_STR(x) case x: return #x
     switch(msg) {
     MSG_TO_STR(WINE_WM_PAUSING);
@@ -121,8 +120,7 @@ static const char * getCmdString(enum win_wm_message msg)
     MSG_TO_STR(WINE_WM_STOPPING);
     }
 #undef MSG_TO_STR
-    sprintf(unknown, "UNKNOWN(0x%08x)", msg);
-    return unknown;
+    return wine_dbg_sprintf("UNKNOWN(0x%08x)", msg);
 }

int getEnables(OSS_DEVICE *ossdev)
@@ -133,7 +131,6 @@ int getEnables(OSS_DEVICE *ossdev)

static const char * getMessage(UINT msg)
 {
-    static char unknown[32];
 #define MSG_TO_STR(x) case x: return #x
     switch(msg) {
     MSG_TO_STR(DRVM_INIT);
@@ -175,8 +172,7 @@ static const char * getMessage(UINT msg)
     MSG_TO_STR(DRV_QUERYDSOUNDDESC);
     }
 #undef MSG_TO_STR
-    sprintf(unknown, "UNKNOWN(0x%04x)", msg);
-    return unknown;
+    return wine_dbg_sprintf("UNKNOWN(0x%04x)", msg);
 }

static DWORD wodDevInterfaceSize(UINT wDevID, LPDWORD dwParam1)
diff --git a/dlls/wineoss.drv/mixer.c b/dlls/wineoss.drv/mixer.c
index 0ed9ab0..ac72c7a 100644
--- a/dlls/wineoss.drv/mixer.c
+++ b/dlls/wineoss.drv/mixer.c
@@ -113,7 +113,6 @@ static struct mixer	MIX_Mixers[MAX_MIXERDRV];

static const char * getMessage(UINT uMsg)
 {
-    static char str[64];
 #define MSG_TO_STR(x) case x: return #x;
     switch (uMsg) {
     MSG_TO_STR(DRVM_INIT);
@@ -130,13 +129,11 @@ static const char * getMessage(UINT uMsg)
     MSG_TO_STR(MXDM_SETCONTROLDETAILS);
     }
 #undef MSG_TO_STR
-    sprintf(str, "UNKNOWN(%08x)", uMsg);
-    return str;
+    return wine_dbg_sprintf("UNKNOWN(%08x)", uMsg);
 }

static const char * getIoctlCommand(int command)
 {
-    static char str[64];
 #define IOCTL_TO_STR(x) case x: return #x;
     switch (command) {
     IOCTL_TO_STR(SOUND_MIXER_VOLUME);
@@ -172,13 +169,11 @@ static const char * getIoctlCommand(int command)
 #endif
     }
 #undef IOCTL_TO_STR
-    sprintf(str, "UNKNOWN(%08x)", command);
-    return str;
+    return wine_dbg_sprintf("UNKNOWN(%08x)", command);
 }

static const char * getControlType(DWORD dwControlType)
 {
-    static char str[64];
 #define TYPE_TO_STR(x) case x: return #x
     switch (dwControlType) {
     TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_CUSTOM);
@@ -214,13 +209,11 @@ static const char * getControlType(DWORD dwControlType)
     TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_MILLITIME);
     }
 #undef TYPE_TO_STR
-    sprintf(str, "UNKNOWN(%08x)", dwControlType);
-    return str;
+    return wine_dbg_sprintf("UNKNOWN(%08x)", dwControlType);
 }

static const char * getComponentType(DWORD dwComponentType)
 {
-    static char str[64];
 #define TYPE_TO_STR(x) case x: return #x;
     switch (dwComponentType) {
     TYPE_TO_STR(MIXERLINE_COMPONENTTYPE_DST_UNDEFINED);
@@ -245,13 +238,11 @@ static const char * getComponentType(DWORD dwComponentType)
     TYPE_TO_STR(MIXERLINE_COMPONENTTYPE_SRC_ANALOG);
     }
 #undef TYPE_TO_STR
-    sprintf(str, "UNKNOWN(%08x)", dwComponentType);
-    return str;
+    return wine_dbg_sprintf("UNKNOWN(%08x)", dwComponentType);
 }

static const char * getTargetType(DWORD dwType)
 {
-    static char str[64];
 #define TYPE_TO_STR(x) case x: return #x;
     switch (dwType) {
     TYPE_TO_STR(MIXERLINE_TARGETTYPE_UNDEFINED);
@@ -262,8 +253,7 @@ static const char * getTargetType(DWORD dwType)
     TYPE_TO_STR(MIXERLINE_TARGETTYPE_AUX);
     }
 #undef TYPE_TO_STR
-    sprintf(str, "UNKNOWN(%08x)", dwType);
-    return str;
+    return wine_dbg_sprintf("UNKNOWN(%08x)", dwType);
 }

static const WCHAR sz_short_volume [] = {'V','o','l',0};