aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 7.3.1305

Browse Source 
Problem:    Warnings from 64 bit compiler.
Solution:   Add type casts.
This commit is contained in:
Bram Moolenaar
2013-07-04 21:19:33 +02:00
parent a3c084cbfa
commit 61214040e9
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/misc2.c
View File

@@ -4680,8 +4680,9 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
STRCPY(ff_expand_buffer, search_ctx->ffsc_start_dir); STRCPY(ff_expand_buffer, search_ctx->ffsc_start_dir);
add_pathsep(ff_expand_buffer); add_pathsep(ff_expand_buffer);
{ {
int eb_len = STRLEN(ff_expand_buffer); int eb_len = (int)STRLEN(ff_expand_buffer);
char_u *buf = alloc(eb_len + STRLEN(search_ctx->ffsc_fix_path) + 1); char_u *buf = alloc(eb_len
+ (int)STRLEN(search_ctx->ffsc_fix_path) + 1);
STRCPY(buf, ff_expand_buffer); STRCPY(buf, ff_expand_buffer);
STRCPY(buf + eb_len, search_ctx->ffsc_fix_path); STRCPY(buf + eb_len, search_ctx->ffsc_fix_path);
@@ -4700,18 +4701,18 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
if (p > search_ctx->ffsc_fix_path) if (p > search_ctx->ffsc_fix_path)
{ {
len = p - search_ctx->ffsc_fix_path - 1; len = (int)(p - search_ctx->ffsc_fix_path) - 1;
STRNCAT(ff_expand_buffer, search_ctx->ffsc_fix_path, len); STRNCAT(ff_expand_buffer, search_ctx->ffsc_fix_path, len);
add_pathsep(ff_expand_buffer); add_pathsep(ff_expand_buffer);
} }
else else
len = STRLEN(search_ctx->ffsc_fix_path); len = (int)STRLEN(search_ctx->ffsc_fix_path);
if (search_ctx->ffsc_wc_path != NULL) if (search_ctx->ffsc_wc_path != NULL)
{ {
wc_path = vim_strsave(search_ctx->ffsc_wc_path); wc_path = vim_strsave(search_ctx->ffsc_wc_path);
temp = alloc(STRLEN(search_ctx->ffsc_wc_path) temp = alloc((int)(STRLEN(search_ctx->ffsc_wc_path)
+ (STRLEN(search_ctx->ffsc_fix_path) - len)); + (STRLEN(search_ctx->ffsc_fix_path)) - len));
} }
if (temp == NULL || wc_path == NULL) if (temp == NULL || wc_path == NULL)

2
src/version.c
View File

@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1305,
/**/ /**/
1304, 1304,
/**/ /**/