proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-21 16:26:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some fixes for Windows x64 warnings

Browse Source
This commit is contained in:
Russell Belfer 2014-01-28 16:25:42 -08:00
parent 3cf11eef17
commit e9d5e5f3d4
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/git2/blame.h
View File

@ -183,7 +183,7 @@ GIT_EXTERN(int) git_blame_buffer(
git_blame **out, git_blame **out,
git_blame *reference, git_blame *reference,
const char *buffer, const char *buffer,
uint32_t buffer_len); size_t buffer_len);
/** /**
* Free memory allocated by git_blame_file or git_blame_buffer. * Free memory allocated by git_blame_file or git_blame_buffer.

2
src/blame.c
View File

@ -450,7 +450,7 @@ int git_blame_buffer(
git_blame **out, git_blame **out,
git_blame *reference, git_blame *reference,
const char *buffer, const char *buffer,
uint32_t buffer_len) size_t buffer_len)
{ {
git_blame *blame; git_blame *blame;
git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT;

2
src/indexer.c
View File

@ -659,7 +659,7 @@ static int inject_object(git_indexer *idx, git_oid *id)
hdr_len = git_packfile__object_header(hdr, len, git_odb_object_type(obj)); hdr_len = git_packfile__object_header(hdr, len, git_odb_object_type(obj));
git_filebuf_write(&idx->pack_file, hdr, hdr_len); git_filebuf_write(&idx->pack_file, hdr, hdr_len);
idx->pack->mwf.size += hdr_len; idx->pack->mwf.size += hdr_len;
entry->crc = crc32(entry->crc, hdr, hdr_len); entry->crc = crc32(entry->crc, hdr, (uInt)hdr_len);
if ((error = git_zstream_deflatebuf(&buf, data, len)) < 0) if ((error = git_zstream_deflatebuf(&buf, data, len)) < 0)
goto cleanup; goto cleanup;

2
src/pack-objects.c
View File

@ -348,7 +348,7 @@ static int write_object(
} }
if (written < 0) { if (written < 0) {
error = written; error = (int)written;
goto done; goto done;
} }

6
src/userdiff.h
View File

@ -193,9 +193,9 @@ PATTERNS("php",
"|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"), "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"),
PATTERNS("javascript", PATTERNS("javascript",
"^[ \t]*(function[ \t][a-zA-Z_][^\{]*)\n" "^[ \t]*(function[ \t][a-zA-Z_][^\\{]*)\n"
"^[ \t]*(var[ \t]+[a-zA-Z_][a-zA-Z0-9_]*[ \t]*=[ \t]*function[ \t\(][^\{]*)\n" "^[ \t]*(var[ \t]+[a-zA-Z_][a-zA-Z0-9_]*[ \t]*=[ \t]*function[ \t\\(][^\\{]*)\n"
"^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*[ \t]*:[ \t]*function[ \t\(][^\{]*)", "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*[ \t]*:[ \t]*function[ \t\\(][^\\{]*)",
/* -- */ /* -- */
"[a-zA-Z_][a-zA-Z0-9_]*" "[a-zA-Z_][a-zA-Z0-9_]*"
"|[-+0-9.e]+[fFlL]?|0[xX]?[0-9a-fA-F]+[lL]?" "|[-+0-9.e]+[fFlL]?|0[xX]?[0-9a-fA-F]+[lL]?"