|
 |
073263 |
To: vim_dev@googlegroups.com
|
|
|
073263 |
Subject: Patch 7.4.404
|
|
|
073263 |
Fcc: outbox
|
|
|
073263 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
073263 |
Mime-Version: 1.0
|
|
|
073263 |
Content-Type: text/plain; charset=UTF-8
|
|
|
073263 |
Content-Transfer-Encoding: 8bit
|
|
|
073263 |
------------
|
|
|
073263 |
|
|
|
073263 |
Patch 7.4.404
|
|
|
073263 |
Problem: Windows 64 bit compiler warnings.
|
|
|
073263 |
Solution: Add type casts. (Mike Williams)
|
|
|
073263 |
Files: src/crypt.c, src/undo.c
|
|
|
073263 |
|
|
|
073263 |
|
|
|
073263 |
*** ../vim-7.4.403/src/crypt.c 2014-08-10 13:34:59.052785459 +0200
|
|
|
073263 |
--- src/crypt.c 2014-08-13 22:02:15.756889031 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 397,409 ****
|
|
|
073263 |
return method->encode_buffer_fn(state, from, len, newptr);
|
|
|
073263 |
if (len == 0)
|
|
|
073263 |
/* Not buffering, just return EOF. */
|
|
|
073263 |
! return len;
|
|
|
073263 |
|
|
|
073263 |
! *newptr = alloc(len);
|
|
|
073263 |
if (*newptr == NULL)
|
|
|
073263 |
return -1;
|
|
|
073263 |
method->encode_fn(state, from, len, *newptr);
|
|
|
073263 |
! return len;
|
|
|
073263 |
}
|
|
|
073263 |
|
|
|
073263 |
/*
|
|
|
073263 |
--- 397,409 ----
|
|
|
073263 |
return method->encode_buffer_fn(state, from, len, newptr);
|
|
|
073263 |
if (len == 0)
|
|
|
073263 |
/* Not buffering, just return EOF. */
|
|
|
073263 |
! return (long)len;
|
|
|
073263 |
|
|
|
073263 |
! *newptr = alloc((long)len);
|
|
|
073263 |
if (*newptr == NULL)
|
|
|
073263 |
return -1;
|
|
|
073263 |
method->encode_fn(state, from, len, *newptr);
|
|
|
073263 |
! return (long)len;
|
|
|
073263 |
}
|
|
|
073263 |
|
|
|
073263 |
/*
|
|
|
073263 |
*** ../vim-7.4.403/src/undo.c 2014-08-12 20:14:28.791371197 +0200
|
|
|
073263 |
--- src/undo.c 2014-08-13 22:02:15.760889031 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 992,998 ****
|
|
|
073263 |
int bufi = 0;
|
|
|
073263 |
|
|
|
073263 |
for (i = len - 1; i >= 0; --i)
|
|
|
073263 |
! buf[bufi++] = nr >> (i * 8);
|
|
|
073263 |
return undo_write(bi, buf, (size_t)len);
|
|
|
073263 |
}
|
|
|
073263 |
|
|
|
073263 |
--- 992,998 ----
|
|
|
073263 |
int bufi = 0;
|
|
|
073263 |
|
|
|
073263 |
for (i = len - 1; i >= 0; --i)
|
|
|
073263 |
! buf[bufi++] = (char_u)(nr >> (i * 8));
|
|
|
073263 |
return undo_write(bi, buf, (size_t)len);
|
|
|
073263 |
}
|
|
|
073263 |
|
|
|
073263 |
***************
|
|
|
073263 |
*** 1093,1099 ****
|
|
|
073263 |
#ifdef FEAT_CRYPT
|
|
|
073263 |
if (bi->bi_buffer != NULL)
|
|
|
073263 |
{
|
|
|
073263 |
! int size_todo = size;
|
|
|
073263 |
char_u *p = buffer;
|
|
|
073263 |
|
|
|
073263 |
while (size_todo > 0)
|
|
|
073263 |
--- 1093,1099 ----
|
|
|
073263 |
#ifdef FEAT_CRYPT
|
|
|
073263 |
if (bi->bi_buffer != NULL)
|
|
|
073263 |
{
|
|
|
073263 |
! int size_todo = (int)size;
|
|
|
073263 |
char_u *p = buffer;
|
|
|
073263 |
|
|
|
073263 |
while (size_todo > 0)
|
|
|
073263 |
***************
|
|
|
073263 |
*** 1119,1125 ****
|
|
|
073263 |
n = bi->bi_avail - bi->bi_used;
|
|
|
073263 |
mch_memmove(p, bi->bi_buffer + bi->bi_used, n);
|
|
|
073263 |
bi->bi_used += n;
|
|
|
073263 |
! size_todo -= n;
|
|
|
073263 |
p += n;
|
|
|
073263 |
}
|
|
|
073263 |
return OK;
|
|
|
073263 |
--- 1119,1125 ----
|
|
|
073263 |
n = bi->bi_avail - bi->bi_used;
|
|
|
073263 |
mch_memmove(p, bi->bi_buffer + bi->bi_used, n);
|
|
|
073263 |
bi->bi_used += n;
|
|
|
073263 |
! size_todo -= (int)n;
|
|
|
073263 |
p += n;
|
|
|
073263 |
}
|
|
|
073263 |
return OK;
|
|
|
073263 |
*** ../vim-7.4.403/src/version.c 2014-08-13 21:58:24.824885492 +0200
|
|
|
073263 |
--- src/version.c 2014-08-13 22:02:35.812889338 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 743,744 ****
|
|
|
073263 |
--- 743,746 ----
|
|
|
073263 |
{ /* Add new patch number below this line */
|
|
|
073263 |
+ /**/
|
|
|
073263 |
+ 404,
|
|
|
073263 |
/**/
|
|
|
073263 |
|
|
|
073263 |
--
|
|
|
073263 |
How To Keep A Healthy Level Of Insanity:
|
|
|
073263 |
10. Ask people what sex they are. Laugh hysterically after they answer.
|
|
|
073263 |
|
|
|
073263 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
073263 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
073263 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
073263 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|