c12169a
To: vim-dev@vim.org
c12169a
Subject: Patch 7.2.304
c12169a
Fcc: outbox
c12169a
From: Bram Moolenaar <Bram@moolenaar.net>
c12169a
Mime-Version: 1.0
c12169a
Content-Type: text/plain; charset=UTF-8
c12169a
Content-Transfer-Encoding: 8bit
c12169a
------------
c12169a
c12169a
Patch 7.2.304
c12169a
Problem:    Compiler warning for bad pointer cast.
c12169a
Solution:   Use another variable for int pointer.
c12169a
Files:	    src/ops.c
c12169a
c12169a
c12169a
*** ../vim-7.2.303/src/ops.c	2009-11-17 12:43:19.000000000 +0100
c12169a
--- src/ops.c	2009-11-18 15:40:26.000000000 +0100
c12169a
***************
c12169a
*** 5597,5603 ****
c12169a
  	    vc.vc_type = CONV_NONE;
c12169a
  	    if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
c12169a
  	    {
c12169a
! 		conv_str = string_convert(&vc, str, (int*)&len;;
c12169a
  		if (conv_str != NULL)
c12169a
  		{
c12169a
  		    vim_free(str);
c12169a
--- 5597,5606 ----
c12169a
  	    vc.vc_type = CONV_NONE;
c12169a
  	    if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
c12169a
  	    {
c12169a
! 	        int intlen = len;
c12169a
! 
c12169a
! 		conv_str = string_convert(&vc, str, &intlen);
c12169a
! 		len = intlen;
c12169a
  		if (conv_str != NULL)
c12169a
  		{
c12169a
  		    vim_free(str);
c12169a
*** ../vim-7.2.303/src/version.c	2009-11-18 20:12:15.000000000 +0100
c12169a
--- src/version.c	2009-11-25 12:37:36.000000000 +0100
c12169a
***************
c12169a
*** 683,684 ****
c12169a
--- 683,686 ----
c12169a
  {   /* Add new patch number below this line */
c12169a
+ /**/
c12169a
+     304,
c12169a
  /**/
c12169a
c12169a
-- 
c12169a
I recommend ordering large cargo containers of paper towels to make up
c12169a
whatever budget underruns you have.  Paper products are always useful and they
c12169a
have the advantage of being completely flushable if you need to make room in
c12169a
the storage area later.
c12169a
				(Scott Adams - The Dilbert principle)
c12169a
c12169a
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
c12169a
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
c12169a
\\\        download, build and distribute -- http://www.A-A-P.org        ///
c12169a
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///