aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.0.1827: compiler warning for signed/unsigned char pointers

Browse Source 
Problem:    Compiler warning for signed/unsigned char pointers. (Cesar Romani)
Solution:   Change the type of jv_argv.
This commit is contained in:
Bram Moolenaar
2018-05-13 14:05:18 +02:00
parent 7db25fed5d
commit b2ed680ba7
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/channel.c
View File

@@ -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. */ /* Make a copy of argv_arg for job->jv_argv. */
for (i = 0; argv_arg[i] != NULL; i++) for (i = 0; argv_arg[i] != NULL; i++)
argc++; argc++;
argv = (char **)alloc(sizeof(char_u *) * (argc + 1)); argv = (char **)alloc(sizeof(char *) * (argc + 1));
if (argv == NULL) if (argv == NULL)
goto theend; goto theend;
for (i = 0; i < argc; i++) 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. */ /* Save the command used to start the job. */
job->jv_argv = (char_u **)argv; job->jv_argv = argv;
#ifdef USE_ARGV #ifdef USE_ARGV
if (ch_log_active()) if (ch_log_active())
@@ -5690,7 +5690,7 @@ theend:
#ifndef USE_ARGV #ifndef USE_ARGV
vim_free(ga.ga_data); vim_free(ga.ga_data);
#endif #endif
if ((char_u **)argv != job->jv_argv) if (argv != job->jv_argv)
vim_free(argv); vim_free(argv);
free_job_options(&opt); free_job_options(&opt);
return job; return job;
@@ -5764,7 +5764,7 @@ job_info(job_T *job, dict_T *dict)
dict_add_list(dict, "cmd", l); dict_add_list(dict, "cmd", l);
if (job->jv_argv != NULL) if (job->jv_argv != NULL)
for (i = 0; job->jv_argv[i] != NULL; i++) 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);
} }
} }

2
src/structs.h
View File

@@ -1488,7 +1488,7 @@ struct jobvar_S
int jv_copyID; int jv_copyID;
channel_T *jv_channel; /* channel for I/O, reference counted */ 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 */
}; };
/* /*

2
src/version.c
View File

@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1827,
/**/ /**/
1826, 1826,
/**/ /**/