To: vim_dev@googlegroups.com
Subject: Patch 8.2.3437
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.3437
Problem:    Compiler warnings for 32/64 bit usage.
Solution:   Add type casts. (Mike Williams, closes #8870)
Files:      src/screen.c, src/xdiff/xemit.c, src/xdiff/xutils.c


*** ../vim-8.2.3436/src/screen.c	2021-09-11 12:15:02.875927707 +0200
--- src/screen.c	2021-09-13 22:14:59.466592066 +0200
***************
*** 4855,4861 ****
  	    {
  		lcs_chars.tab1 = NUL;
  		lcs_chars.tab3 = NUL;
! 		if (multispace_len)
  		{
  		    lcs_chars.multispace = ALLOC_MULT(int, multispace_len + 1);
  		    lcs_chars.multispace[multispace_len] = NUL;
--- 4855,4861 ----
  	    {
  		lcs_chars.tab1 = NUL;
  		lcs_chars.tab3 = NUL;
! 		if (multispace_len > 0)
  		{
  		    lcs_chars.multispace = ALLOC_MULT(int, multispace_len + 1);
  		    lcs_chars.multispace[multispace_len] = NUL;
***************
*** 4904,4910 ****
  
  		    if (*s == ',' || *s == NUL)
  		    {
! 			if (round)
  			{
  			    if (tab[i].cp == &lcs_chars.tab2)
  			    {
--- 4904,4910 ----
  
  		    if (*s == ',' || *s == NUL)
  		    {
! 			if (round > 0)
  			{
  			    if (tab[i].cp == &lcs_chars.tab2)
  			    {
***************
*** 4924,4930 ****
  
  	    if (i == entries)
  	    {
! 		len = STRLEN("multispace");
  		if ((varp == &p_lcs || varp == &wp->w_p_lcs)
  			&& STRNCMP(p, "multispace", len) == 0
  			&& p[len] == ':'
--- 4924,4930 ----
  
  	    if (i == entries)
  	    {
! 		len = (int)STRLEN("multispace");
  		if ((varp == &p_lcs || varp == &wp->w_p_lcs)
  			&& STRNCMP(p, "multispace", len) == 0
  			&& p[len] == ':'
***************
*** 4951,4956 ****
--- 4951,4957 ----
  		    else
  		    {
  			int multispace_pos = 0;
+ 
  			while (*s != NUL && *s != ',')
  			{
  			    c1 = mb_ptr2char_adv(&s);
*** ../vim-8.2.3436/src/xdiff/xemit.c	2021-08-31 20:46:34.872123774 +0200
--- src/xdiff/xemit.c	2021-09-13 22:14:59.466592066 +0200
***************
*** 31,37 ****
  
  
  static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *ecb) {
! 	long size, psize = strlen(pre);
  	char const *rec;
  
  	size = xdl_get_rec(xdf, ri, &rec);
--- 31,37 ----
  
  
  static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *ecb) {
! 	long size, psize = (long)strlen(pre);
  	char const *rec;
  
  	size = xdl_get_rec(xdf, ri, &rec);
*** ../vim-8.2.3436/src/xdiff/xutils.c	2021-08-31 20:46:34.876123765 +0200
--- src/xdiff/xutils.c	2021-09-13 22:14:59.466592066 +0200
***************
*** 47,53 ****
  	mb[1].size = size;
  	if (size > 0 && rec[size - 1] != '\n') {
  		mb[2].ptr = (char *) "\n\\ No newline at end of file\n";
! 		mb[2].size = strlen(mb[2].ptr);
  		i++;
  	}
  	if (ecb->out_line(ecb->priv, mb, i) < 0) {
--- 47,53 ----
  	mb[1].size = size;
  	if (size > 0 && rec[size - 1] != '\n') {
  		mb[2].ptr = (char *) "\n\\ No newline at end of file\n";
! 		mb[2].size = (long)strlen(mb[2].ptr);
  		i++;
  	}
  	if (ecb->out_line(ecb->priv, mb, i) < 0) {
*** ../vim-8.2.3436/src/version.c	2021-09-13 21:36:23.737110573 +0200
--- src/version.c	2021-09-13 22:16:44.050469004 +0200
***************
*** 757,758 ****
--- 757,760 ----
  {   /* Add new patch number below this line */
+ /**/
+     3437,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
9. As often as possible, skip rather than walk.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///