Commit 9e3aa947 by nulltoken

Fix compilation warnings in MSVC

parent a51201cc
...@@ -633,7 +633,7 @@ static int do_lstat(const char *file_name, struct stat *buf) ...@@ -633,7 +633,7 @@ static int do_lstat(const char *file_name, struct stat *buf)
buf->st_gid = 0; buf->st_gid = 0;
buf->st_uid = 0; buf->st_uid = 0;
buf->st_nlink = 1; buf->st_nlink = 1;
buf->st_mode = fMode; buf->st_mode = (unsigned short)fMode;
buf->st_size = fdata.nFileSizeLow; /* Can't use nFileSizeHigh, since it's not a stat64 */ buf->st_size = fdata.nFileSizeLow; /* Can't use nFileSizeHigh, since it's not a stat64 */
buf->st_dev = buf->st_rdev = (_getdrive() - 1); buf->st_dev = buf->st_rdev = (_getdrive() - 1);
buf->st_atime = filetime_to_time_t(&(fdata.ftLastAccessTime)); buf->st_atime = filetime_to_time_t(&(fdata.ftLastAccessTime));
...@@ -686,6 +686,7 @@ int gitfo_lstat__w32(const char *file_name, struct stat *buf) ...@@ -686,6 +686,7 @@ int gitfo_lstat__w32(const char *file_name, struct stat *buf)
alt_name[namelen] = 0; alt_name[namelen] = 0;
return do_lstat(alt_name, buf); return do_lstat(alt_name, buf);
} }
int gitfo_readlink__w32(const char *link, char *target, size_t target_len) int gitfo_readlink__w32(const char *link, char *target, size_t target_len)
{ {
HANDLE hFile; HANDLE hFile;
...@@ -711,7 +712,7 @@ int gitfo_readlink__w32(const char *link, char *target, size_t target_len) ...@@ -711,7 +712,7 @@ int gitfo_readlink__w32(const char *link, char *target, size_t target_len)
if (dwRet > 4) { if (dwRet > 4) {
/* Skip first 4 characters if they are "\\?\" */ /* Skip first 4 characters if they are "\\?\" */
if (target[0] == '\\' && target[1] == '\\' && target[2] == '?' && target[3] == '\\') { if (target[0] == '\\' && target[1] == '\\' && target[2] == '?' && target[3] == '\\') {
char tmp[MAXPATHLEN]; char tmp[GIT_PATH_MAX];
unsigned int offset = 4; unsigned int offset = 4;
dwRet -= 4; dwRet -= 4;
......
...@@ -21,8 +21,6 @@ ...@@ -21,8 +21,6 @@
# define S_ISFIFO(m) (((m) & _S_IFMT) == _S_IFIFO) # define S_ISFIFO(m) (((m) & _S_IFMT) == _S_IFIFO)
# define S_ISLNK(m) (((m) & _S_IFMT) == _S_IFLNK) # define S_ISLNK(m) (((m) & _S_IFMT) == _S_IFLNK)
# define MAXPATHLEN MAX_PATH
/* case-insensitive string comparison */ /* case-insensitive string comparison */
# define strcasecmp _stricmp # define strcasecmp _stricmp
# define strncasecmp _strnicmp # define strncasecmp _strnicmp
......
...@@ -81,7 +81,7 @@ BEGIN_TEST(read0, "acces randomly the entries on a loaded tree") ...@@ -81,7 +81,7 @@ BEGIN_TEST(read0, "acces randomly the entries on a loaded tree")
must_be_true(git_tree_entry_byindex(tree, 0) != NULL); must_be_true(git_tree_entry_byindex(tree, 0) != NULL);
must_be_true(git_tree_entry_byindex(tree, 2) != NULL); must_be_true(git_tree_entry_byindex(tree, 2) != NULL);
must_be_true(git_tree_entry_byindex(tree, 3) == NULL); must_be_true(git_tree_entry_byindex(tree, 3) == NULL);
must_be_true(git_tree_entry_byindex(tree, -1) == NULL); must_be_true(git_tree_entry_byindex(tree, (unsigned int)-1) == NULL);
git_tree_close(tree); git_tree_close(tree);
git_repository_free(repo); git_repository_free(repo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment