diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-05-13 14:05:18 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-05-13 14:05:18 +0200 |
| commit | b2ed680ba760ec5eb2c626363ecbda4dd2528794 (patch) | |
| tree | ded2b5e0116b9e8ccb9571ff389cf4e55ac60471 | |
| parent | 7db25fed5de1be922b8cbb0328149469606a0424 (diff) | |
patch 8.0.1827: compiler warning for signed/unsigned char pointersv8.0.1827
Problem: Compiler warning for signed/unsigned char pointers. (Cesar Romani)
Solution: Change the type of jv_argv.
| -rw-r--r-- | src/channel.c | 8 | ||||
| -rw-r--r-- | src/structs.h | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/channel.c b/src/channel.c index b883b47d2a..9023808d68 100644 --- a/src/channel.c +++ b/src/channel.c @@ -5616,7 +5616,7 @@ job_start(typval_T *argvars, char **argv_arg, jobopt_T *opt_arg) /* Make a copy of argv_arg for job->jv_argv. */ for (i = 0; argv_arg[i] != NULL; i++) argc++; - argv = (char **)alloc(sizeof(char_u *) * (argc + 1)); + argv = (char **)alloc(sizeof(char *) * (argc + 1)); if (argv == NULL) goto theend; for (i = 0; i < argc; i++) @@ -5659,7 +5659,7 @@ job_start(typval_T *argvars, char **argv_arg, jobopt_T *opt_arg) } /* Save the command used to start the job. */ - job->jv_argv = (char_u **)argv; + job->jv_argv = argv; #ifdef USE_ARGV if (ch_log_active()) @@ -5690,7 +5690,7 @@ theend: #ifndef USE_ARGV vim_free(ga.ga_data); #endif - if ((char_u **)argv != job->jv_argv) + if (argv != job->jv_argv) vim_free(argv); free_job_options(&opt); return job; @@ -5764,7 +5764,7 @@ job_info(job_T *job, dict_T *dict) dict_add_list(dict, "cmd", l); if (job->jv_argv != NULL) for (i = 0; job->jv_argv[i] != NULL; i++) - list_append_string(l, job->jv_argv[i], -1); + list_append_string(l, (char_u *)job->jv_argv[i], -1); } } diff --git a/src/structs.h b/src/structs.h index 5c4a74cac7..b70b00f96c 100644 --- a/src/structs.h +++ b/src/structs.h @@ -1488,7 +1488,7 @@ struct jobvar_S int jv_copyID; channel_T *jv_channel; /* channel for I/O, reference counted */ - char_u **jv_argv; /* command line used to start the job */ + char **jv_argv; /* command line used to start the job */ }; /* diff --git a/src/version.c b/src/version.c index 0348dc13e7..1589ed921a 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1827, +/**/ 1826, /**/ 1825, |