TDE
/
tdegames
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdegames
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix FTBFS caused by invalid cast. This resolves issue #38.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit d45d96cd06)
r14.1.x r14.1.2
Michele Calgaro 7 months ago
parent 6a21e1332f
commit 1252295248
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File

15
kpat/freecell-solver/cmd_line.c
Unescape View File

@ -518,7 +518,7 @@ int freecell_solver_user_cmd_line_parse_args_with_file_nesting_count(
{ {
int a; int a;
const char * start_num; const char * start_num;
char * end_num; const char * end_num;
char * num_copy; char * num_copy;
start_num = argv[arg]; start_num = argv[arg];
for(a=0;a<5;a++) for(a=0;a<5;a++)
@ -642,7 +642,7 @@ int freecell_solver_user_cmd_line_parse_args_with_file_nesting_count(
*last_arg = arg-1; *last_arg = arg-1;
return FCS_CMD_LINE_PARAM_WITH_NO_ARG; return FCS_CMD_LINE_PARAM_WITH_NO_ARG;
} }
freecell_solver_user_set_soft_thread_name(instance, argv[arg]); freecell_solver_user_set_soft_thread_name(instance, (char*)argv[arg]);
} }
else if ((!strcmp(argv[arg], "--prelude"))) else if ((!strcmp(argv[arg], "--prelude")))
{ {
@ -652,7 +652,7 @@ int freecell_solver_user_cmd_line_parse_args_with_file_nesting_count(
*last_arg = arg-1; *last_arg = arg-1;
return FCS_CMD_LINE_PARAM_WITH_NO_ARG; return FCS_CMD_LINE_PARAM_WITH_NO_ARG;
} }
freecell_solver_user_set_hard_thread_prelude(instance, argv[arg]); freecell_solver_user_set_hard_thread_prelude(instance, (char*)argv[arg]);
} }
else if ((!strcmp(argv[arg], "-opt-to")) || (!strcmp(argv[arg], "--optimization-tests-order"))) else if ((!strcmp(argv[arg], "-opt-to")) || (!strcmp(argv[arg], "--optimization-tests-order")))
{ {
@ -746,7 +746,8 @@ int freecell_solver_user_cmd_line_parse_args_with_file_nesting_count(
else else
{ {
int num_to_skip = 0; int num_to_skip = 0;
char * s, * buffer; const char * s;
char * buffer;
FILE * f; FILE * f;
long file_len; long file_len;
int ret; int ret;
@ -842,7 +843,7 @@ int freecell_solver_user_cmd_line_parse_args_with_file_nesting_count(
ret = freecell_solver_user_cmd_line_parse_args_with_file_nesting_count( ret = freecell_solver_user_cmd_line_parse_args_with_file_nesting_count(
instance, instance,
args_man->argc - num_to_skip, args_man->argc - num_to_skip,
args_man->argv + num_to_skip, (const char **)(args_man->argv + num_to_skip),
0, 0,
known_parameters, known_parameters,
callback, callback,
@ -879,7 +880,7 @@ int freecell_solver_user_cmd_line_parse_args_with_file_nesting_count(
args_man_t * preset_args = 0; args_man_t * preset_args = 0;
char * dir = NULL; char * dir = NULL;
status = read_preset(argv[arg], &preset_args, &dir, NULL); status = read_preset((char*)argv[arg], &preset_args, &dir, NULL);
if (status != 0) if (status != 0)
{ {
char * err_str; char * err_str;
@ -896,7 +897,7 @@ int freecell_solver_user_cmd_line_parse_args_with_file_nesting_count(
ret = freecell_solver_user_cmd_line_parse_args_with_file_nesting_count( ret = freecell_solver_user_cmd_line_parse_args_with_file_nesting_count(
instance, instance,
preset_args->argc, preset_args->argc,
preset_args->argv, (const char**)preset_args->argv,
0, 0,
known_parameters, known_parameters,
callback, callback,

2
kpat/freecell-solver/fcs_cl.h
Unescape View File

@ -12,7 +12,7 @@ typedef int (*freecell_solver_user_cmd_line_known_commands_callback_t)
( (
void * instance, void * instance,
int argc, int argc,
char * argv[], const char * argv[],
int arg_index, int arg_index,
int * num_to_skip, int * num_to_skip,
int * ret, int * ret,

Write Preview
Loading…
Cancel
Save