To: vim_dev@googlegroups.com Subject: Patch 8.0.1827 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1827 Problem: Compiler warning for signed/unsigned char pointers. (Cesar Romani) Solution: Change the type of jv_argv. Files: src/channel.c, src/structs.h *** ../vim-8.0.1826/src/channel.c 2018-05-05 21:00:56.804628425 +0200 --- src/channel.c 2018-05-13 14:00:48.830468305 +0200 *************** *** 5616,5622 **** /* 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)); if (argv == NULL) goto theend; for (i = 0; i < argc; i++) --- 5619,5625 ---- /* Make a copy of argv_arg for job->jv_argv. */ for (i = 0; argv_arg[i] != NULL; i++) argc++; ! argv = (char **)alloc(sizeof(char *) * (argc + 1)); if (argv == NULL) goto theend; for (i = 0; i < argc; i++) *************** *** 5659,5665 **** } /* Save the command used to start the job. */ ! job->jv_argv = (char_u **)argv; #ifdef USE_ARGV if (ch_log_active()) --- 5662,5668 ---- } /* Save the command used to start the job. */ ! job->jv_argv = argv; #ifdef USE_ARGV if (ch_log_active()) *************** *** 5690,5696 **** #ifndef USE_ARGV vim_free(ga.ga_data); #endif ! if ((char_u **)argv != job->jv_argv) vim_free(argv); free_job_options(&opt); return job; --- 5693,5699 ---- #ifndef USE_ARGV vim_free(ga.ga_data); #endif ! if (argv != job->jv_argv) vim_free(argv); free_job_options(&opt); return job; *************** *** 5764,5770 **** 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); } } --- 5767,5773 ---- dict_add_list(dict, "cmd", l); if (job->jv_argv != NULL) for (i = 0; job->jv_argv[i] != NULL; i++) ! list_append_string(l, (char_u *)job->jv_argv[i], -1); } } *** ../vim-8.0.1826/src/structs.h 2018-05-12 15:38:22.478714221 +0200 --- src/structs.h 2018-05-13 14:01:15.602296125 +0200 *************** *** 1488,1494 **** int jv_copyID; channel_T *jv_channel; /* channel for I/O, reference counted */ ! char_u **jv_argv; /* command line used to start the job */ }; /* --- 1488,1494 ---- int jv_copyID; channel_T *jv_channel; /* channel for I/O, reference counted */ ! char **jv_argv; /* command line used to start the job */ }; /* *** ../vim-8.0.1826/src/version.c 2018-05-12 21:38:09.991347643 +0200 --- src/version.c 2018-05-13 14:04:04.669210584 +0200 *************** *** 763,764 **** --- 763,766 ---- { /* Add new patch number below this line */ + /**/ + 1827, /**/ -- "When I die, I want a tombstone that says "GAME OVER" - Ton Richters /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///