Merge pull request #1003 from turol/const

Non-trivial constness fix
This commit is contained in:
Mike Swanson 2018-03-20 12:08:05 -07:00 committed by GitHub
commit 4a3c8c6d7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -282,7 +282,7 @@ static char *SelectDirectory(char *window_title)
return result;
}
char *TXT_SelectFile(char *window_title, char **extensions)
char *TXT_SelectFile(const char *window_title, char **extensions)
{
OPENFILENAME fm;
char selected[MAX_PATH] = "";
@ -621,8 +621,8 @@ char *TXT_SelectFile(const char *window_title, char **extensions)
}
argv = calloc(5 + NumExtensions(extensions), sizeof(char *));
argv[0] = ZENITY_BINARY;
argv[1] = "--file-selection";
argv[0] = strdup(ZENITY_BINARY);
argv[1] = strdup("--file-selection");
argc = 2;
if (window_title != NULL)
@ -662,7 +662,7 @@ char *TXT_SelectFile(const char *window_title, char **extensions)
result = ExecReadOutput(argv);
for (i = 2; i < argc; ++i)
for (i = 0; i < argc; ++i)
{
free(argv[i]);
}