7.3.436

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.436
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.436
  11 Problem:    Compiler warnings for types on Windows.
  12 Solution:   Add type casts. (Mike Williams)
  13 Files:      src/eval.c
  14
  15
  16 *** ../vim-7.3.435/src/eval.c   2012-02-06 00:13:16.000000000 +0100
  17 --- src/eval.c  2012-02-11 20:38:16.000000000 +0100
  18 ***************
  19 *** 14462,14468 ****
  20                             --prevlen;
  21                 }
  22                 if (prevlen == 0)
  23 !                   s = vim_strnsave(start, len);
  24                 else
  25                 {
  26                     /* Change "prev" buffer to be the right size.  This way
  27 --- 14462,14468 ----
  28                             --prevlen;
  29                 }
  30                 if (prevlen == 0)
  31 !                   s = vim_strnsave(start, (int)len);
  32                 else
  33                 {
  34                     /* Change "prev" buffer to be the right size.  This way
  35 ***************
  36 *** 14529,14535 ****
  37
  38                         if (dest < buf)
  39                         {
  40 !                           adjust_prevlen = buf - dest; /* must be 1 or 2 */
  41                             dest = buf;
  42                         }
  43                         if (readlen > p - buf + 1)
  44 --- 14529,14535 ----
  45
  46                         if (dest < buf)
  47                         {
  48 !                           adjust_prevlen = (int)(buf - dest); /* must be 1 or 2 */
  49                             dest = buf;
  50                         }
  51                         if (readlen > p - buf + 1)
  52 ***************
  53 *** 14558,14568 ****
  54                  * small, to avoid repeatedly 'allocing' large and
  55                  * 'reallocing' small. */
  56                 if (prevsize == 0)
  57 !                   prevsize = p - start;
  58                 else
  59                 {
  60                     long grow50pc = (prevsize * 3) / 2;
  61 !                   long growmin  = (p - start) * 2 + prevlen;
  62                     prevsize = grow50pc > growmin ? grow50pc : growmin;
  63                 }
  64                 if ((newprev = vim_realloc(prev, prevsize)) == NULL)
  65 --- 14558,14568 ----
  66                  * small, to avoid repeatedly 'allocing' large and
  67                  * 'reallocing' small. */
  68                 if (prevsize == 0)
  69 !                   prevsize = (long)(p - start);
  70                 else
  71                 {
  72                     long grow50pc = (prevsize * 3) / 2;
  73 !                   long growmin  = (long)((p - start) * 2 + prevlen);
  74                     prevsize = grow50pc > growmin ? grow50pc : growmin;
  75                 }
  76                 if ((newprev = vim_realloc(prev, prevsize)) == NULL)
  77 ***************
  78 *** 14575,14581 ****
  79             }
  80             /* Add the line part to end of "prev". */
  81             mch_memmove(prev + prevlen, start, p - start);
  82 !           prevlen += p - start;
  83         }
  84       } /* while */
  85
  86 --- 14575,14581 ----
  87             }
  88             /* Add the line part to end of "prev". */
  89             mch_memmove(prev + prevlen, start, p - start);
  90 !           prevlen += (long)(p - start);
  91         }
  92       } /* while */
  93
  94 *** ../vim-7.3.435/src/version.c        2012-02-11 20:40:49.000000000 +0100
  95 --- src/version.c       2012-02-11 20:43:18.000000000 +0100
  96 ***************
  97 *** 716,717 ****
  98 --- 716,719 ----
  99   {   /* Add new patch number below this line */
 100 + /**/
 101 +     436,
 102   /**/
 103
 104 --
 105 hundred-and-one symptoms of being an internet addict:
 106 39. You move into a new house and decide to Netscape before you landscape.
 107
 108  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 109 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 110 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
 111  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///