Commit 7da1d6d1 authored by Andrew Talbot's avatar Andrew Talbot Committed by Alexandre Julliard

dbghelp: Cast-qual warnings fix.

parent 5a2227f8
...@@ -349,6 +349,7 @@ BOOL WINAPI SymFindFileInPath(HANDLE hProcess, PCSTR inSearchPath, PCSTR full_pa ...@@ -349,6 +349,7 @@ BOOL WINAPI SymFindFileInPath(HANDLE hProcess, PCSTR inSearchPath, PCSTR full_pa
struct process* pcs = process_find_by_handle(hProcess); struct process* pcs = process_find_by_handle(hProcess);
char tmp[MAX_PATH]; char tmp[MAX_PATH];
char* ptr; char* ptr;
char* buf = NULL;
const char* filename; const char* filename;
const char* searchPath = inSearchPath; const char* searchPath = inSearchPath;
...@@ -360,7 +361,6 @@ BOOL WINAPI SymFindFileInPath(HANDLE hProcess, PCSTR inSearchPath, PCSTR full_pa ...@@ -360,7 +361,6 @@ BOOL WINAPI SymFindFileInPath(HANDLE hProcess, PCSTR inSearchPath, PCSTR full_pa
if (!searchPath) if (!searchPath)
{ {
unsigned len = WideCharToMultiByte(CP_ACP, 0, pcs->search_path, -1, NULL, 0, NULL, NULL); unsigned len = WideCharToMultiByte(CP_ACP, 0, pcs->search_path, -1, NULL, 0, NULL, NULL);
char* buf;
searchPath = buf = HeapAlloc(GetProcessHeap(), 0, len); searchPath = buf = HeapAlloc(GetProcessHeap(), 0, len);
if (!searchPath) return FALSE; if (!searchPath) return FALSE;
...@@ -381,8 +381,7 @@ BOOL WINAPI SymFindFileInPath(HANDLE hProcess, PCSTR inSearchPath, PCSTR full_pa ...@@ -381,8 +381,7 @@ BOOL WINAPI SymFindFileInPath(HANDLE hProcess, PCSTR inSearchPath, PCSTR full_pa
if (sffip_cb(full_path, &s)) if (sffip_cb(full_path, &s))
{ {
strcpy(buffer, full_path); strcpy(buffer, full_path);
if (searchPath != inSearchPath) HeapFree(GetProcessHeap(), 0, buf);
HeapFree(GetProcessHeap(), 0, (char*)searchPath);
return TRUE; return TRUE;
} }
...@@ -403,12 +402,10 @@ BOOL WINAPI SymFindFileInPath(HANDLE hProcess, PCSTR inSearchPath, PCSTR full_pa ...@@ -403,12 +402,10 @@ BOOL WINAPI SymFindFileInPath(HANDLE hProcess, PCSTR inSearchPath, PCSTR full_pa
if (do_search(filename, tmp, FALSE, sffip_cb, &s)) if (do_search(filename, tmp, FALSE, sffip_cb, &s))
{ {
strcpy(buffer, tmp); strcpy(buffer, tmp);
if (searchPath != inSearchPath) HeapFree(GetProcessHeap(), 0, buf);
HeapFree(GetProcessHeap(), 0, (char*)searchPath);
return TRUE; return TRUE;
} }
} }
if (searchPath != inSearchPath) HeapFree(GetProcessHeap(), 0, buf);
HeapFree(GetProcessHeap(), 0, (char*)searchPath);
return FALSE; return FALSE;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment