Michael Stefaniuc : winex11: Use debugstr_a to print strings that can be NULL.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Mar 14 09:05:21 CDT 2016


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

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Mon Mar 14 10:38:02 2016 +0100

winex11: Use debugstr_a to print strings that can be NULL.

Signed-off-by: Michael Stefaniuc <mstefani at redhat.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winex11.drv/wintab.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c
index 3642a47..bb3fcb8 100644
--- a/dlls/winex11.drv/wintab.c
+++ b/dlls/winex11.drv/wintab.c
@@ -565,7 +565,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault)
         WTI_CURSORS_INFO cursor;
 
         TRACE("Device %i:  [id %d|name %s|type %s|num_classes %d|use %d]\n",
-                loop, (int) devices[loop].id, devices[loop].name, device_type ? device_type : "",
+                loop, (int) devices[loop].id, devices[loop].name, debugstr_a(device_type),
                 devices[loop].num_classes, devices[loop].use );
 
         switch (devices[loop].use)
@@ -620,7 +620,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault)
             if (! is_tablet_cursor(target->name, device_type))
             {
                 WARN("Skipping device %d [name %s|type %s]; not apparently a tablet cursor type device.  If this is wrong, please report it to wine-devel at winehq.org\n",
-                     loop, devices[loop].name, device_type ? device_type : "");
+                     loop, devices[loop].name, debugstr_a(device_type));
                 break;
             }
 




More information about the wine-cvs mailing list