comparison src/terminal.c @ 29442:827d9f2b7a71 v9.0.0063

patch 9.0.0063: too many type casts for dict_get functions Commit: https://github.com/vim/vim/commit/d61efa50f8f5b9d9dcbc136705cc33874f0fdcb3 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jul 23 09:52:04 2022 +0100 patch 9.0.0063: too many type casts for dict_get functions Problem: Too many type casts for dict_get functions. Solution: Change the key argument from "char_u *" to "char *".
author Bram Moolenaar <Bram@vim.org>
date Sat, 23 Jul 2022 11:00:04 +0200
parents 9ec0dafac7fc
children 89e1d67814a9
comparison
equal deleted inserted replaced
29441:2a189fa0dcd7 29442:827d9f2b7a71
4336 && opt_item->li_tv.vval.v_dict != NULL) 4336 && opt_item->li_tv.vval.v_dict != NULL)
4337 { 4337 {
4338 dict_T *dict = opt_item->li_tv.vval.v_dict; 4338 dict_T *dict = opt_item->li_tv.vval.v_dict;
4339 char_u *p; 4339 char_u *p;
4340 4340
4341 p = dict_get_string(dict, (char_u *)"ff", FALSE); 4341 p = dict_get_string(dict, "ff", FALSE);
4342 if (p == NULL) 4342 if (p == NULL)
4343 p = dict_get_string(dict, (char_u *)"fileformat", FALSE); 4343 p = dict_get_string(dict, "fileformat", FALSE);
4344 if (p != NULL) 4344 if (p != NULL)
4345 { 4345 {
4346 if (check_ff_value(p) == FAIL) 4346 if (check_ff_value(p) == FAIL)
4347 ch_log(NULL, "Invalid ff argument to drop: %s", p); 4347 ch_log(NULL, "Invalid ff argument to drop: %s", p);
4348 else 4348 else
4349 ea.force_ff = *p; 4349 ea.force_ff = *p;
4350 } 4350 }
4351 p = dict_get_string(dict, (char_u *)"enc", FALSE); 4351 p = dict_get_string(dict, "enc", FALSE);
4352 if (p == NULL) 4352 if (p == NULL)
4353 p = dict_get_string(dict, (char_u *)"encoding", FALSE); 4353 p = dict_get_string(dict, "encoding", FALSE);
4354 if (p != NULL) 4354 if (p != NULL)
4355 { 4355 {
4356 ea.cmd = alloc(STRLEN(p) + 12); 4356 ea.cmd = alloc(STRLEN(p) + 12);
4357 if (ea.cmd != NULL) 4357 if (ea.cmd != NULL)
4358 { 4358 {
4360 ea.force_enc = 11; 4360 ea.force_enc = 11;
4361 tofree = ea.cmd; 4361 tofree = ea.cmd;
4362 } 4362 }
4363 } 4363 }
4364 4364
4365 p = dict_get_string(dict, (char_u *)"bad", FALSE); 4365 p = dict_get_string(dict, "bad", FALSE);
4366 if (p != NULL) 4366 if (p != NULL)
4367 get_bad_opt(p, &ea); 4367 get_bad_opt(p, &ea);
4368 4368
4369 if (dict_has_key(dict, "bin")) 4369 if (dict_has_key(dict, "bin"))
4370 ea.force_bin = FORCE_BIN; 4370 ea.force_bin = FORCE_BIN;
4993 return; 4993 return;
4994 } 4994 }
4995 d = argvars[2].vval.v_dict; 4995 d = argvars[2].vval.v_dict;
4996 if (d != NULL) 4996 if (d != NULL)
4997 { 4997 {
4998 max_height = dict_get_number(d, (char_u *)"rows"); 4998 max_height = dict_get_number(d, "rows");
4999 max_width = dict_get_number(d, (char_u *)"columns"); 4999 max_width = dict_get_number(d, "columns");
5000 } 5000 }
5001 } 5001 }
5002 5002
5003 fname = tv_get_string_chk(&argvars[1]); 5003 fname = tv_get_string_chk(&argvars[1]);
5004 if (fname == NULL) 5004 if (fname == NULL)