summaryrefslogtreecommitdiff
path: root/windows
diff options
context:
space:
mode:
Diffstat (limited to 'windows')
-rw-r--r--windows/findfile.c17
-rw-r--r--windows/gui.c2
2 files changed, 9 insertions, 10 deletions
diff --git a/windows/findfile.c b/windows/findfile.c
index b7b5bea6d..8a3cb44a6 100644
--- a/windows/findfile.c
+++ b/windows/findfile.c
@@ -66,13 +66,6 @@ nsws_init_resource(const char *resource_path)
pathi++;
pathv[pathi] = winpath;
-
- pathi = 0;
- while (pathv[pathi] != NULL) {
- LOG(("pathv[%d] = \"%s\"",pathi, pathv[pathi]));
- pathi++;
- }
-
respath = filepath_generate(pathv, &lang);
filepath_free_strvec(pathv);
@@ -88,9 +81,17 @@ static char *realpath(const char *path, char *resolved_path)
char *path_to_url(const char *path)
{
- char *url = malloc(strlen(path) + FILE_SCHEME_PREFIX_LEN + 3);
+ char *url;
char *sidx;
+ if (path == NULL)
+ return NULL;
+
+ url = malloc(strlen(path) + FILE_SCHEME_PREFIX_LEN + 3);
+
+ if (url == NULL)
+ return NULL;
+
strcpy(url, FILE_SCHEME_PREFIX);
if (*path == '/') {
/* unix style path start, so try wine Z: */
diff --git a/windows/gui.c b/windows/gui.c
index 58c749808..e8f1adff8 100644
--- a/windows/gui.c
+++ b/windows/gui.c
@@ -2603,8 +2603,6 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd)
LPWSTR *argvw;
char *messages;
- verbose_log = true;
-
if (SLEN(lpcli) > 0) {
argvw = CommandLineToArgvW(GetCommandLineW(), &argc);
}