[xine-cvs] CVS: xine-lib/src/libw32dll/wine win32.c,1.31,1.32

[Frantisek D. <va...@us...>]

Update of /cvsroot/xine/xine-lib/src/libw32dll/wine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20195/wine

Modified Files:
	win32.c 
Log Message:
[coverity]

Small change due to false positive:

CID: 258
Checker: REVERSE_INULL (help)
File: xine-lib/src/libw32dll/wine/win32.c
Function: expRegOpenKeyA
Description: Pointer "phkResult" dereferenced before NULL check


Debug output fix:

CID: 259
Checker: REVERSE_INULL (help)
File: xine-lib/src/libw32dll/wine/win32.c
Function: expSetFilePointer
Description: Pointer "ext" dereferenced before NULL check


Index: win32.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libw32dll/wine/win32.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- win32.c	7 May 2005 09:11:38 -0000	1.31
+++ win32.c	26 Mar 2006 18:15:03 -0000	1.32
@@ -1892,7 +1892,7 @@
 static long WINAPI expRegOpenKeyA (long hKey, LPCSTR lpSubKey, int* phkResult)
 {
     long result=RegOpenKeyExA(hKey, lpSubKey, 0, 0, phkResult);
-    dbgprintf("RegOpenKeyExA(key 0x%x, subkey '%s', 0x%x) => %d\n",
+    dbgprintf("RegOpenKeyExA(key 0x%x, subkey '%s', 0x%p) => %d\n",
 	      hKey, lpSubKey, phkResult, result);
     if(!result && phkResult) dbgprintf("  New key: 0x%x\n", *phkResult);
     return result;
@@ -3631,7 +3631,7 @@
 static DWORD  WINAPI expSetFilePointer(HANDLE h, LONG val, LPLONG ext, DWORD whence)
 {
     int wh;
-    dbgprintf("SetFilePointer(%d, 0x%x, 0x%x = %d, %d)\n", h, val, ext, *ext, whence);
+    dbgprintf("SetFilePointer(%d, 0x%x, 0x%x = %d, %d)\n", h, val, ext, ext ? *ext : -1, whence);
     //why would DLL want temporary file with >2Gb size?
     switch(whence)
     {