summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornulltoken <emeric.fermas@gmail.com>2012-01-04 17:59:48 +0100
committernulltoken <emeric.fermas@gmail.com>2012-01-04 18:17:55 +0100
commitacb159e19159f63651eb2ccc8e4a4a31771c08c5 (patch)
tree4dcfd7ace3ca818acf69a8bef16b7e17a2b03ec2
parent7d93f96aa90c22fa7ebcbc954ad71e1cfed7013e (diff)
downloadlibgit2-acb159e19159f63651eb2ccc8e4a4a31771c08c5.tar.gz
Fix MSVC compilation warnings
-rw-r--r--src/attr.c2
-rw-r--r--tests-clay/attr/file.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/attr.c b/src/attr.c
index f984458d4..679380bba 100644
--- a/src/attr.c
+++ b/src/attr.c
@@ -73,7 +73,7 @@ int git_attr_get_many(
attr_get_many_info *info = NULL;
size_t num_found = 0;
- memset(values, 0, sizeof(const char *) * num_attr);
+ memset((void *)values, 0, sizeof(const char *) * num_attr);
if ((error = git_attr_path__init(&path, pathname)) < GIT_SUCCESS ||
(error = collect_attr_files(repo, pathname, &files)) < GIT_SUCCESS)
diff --git a/tests-clay/attr/file.c b/tests-clay/attr/file.c
index d9e2d5701..acca0c653 100644
--- a/tests-clay/attr/file.c
+++ b/tests-clay/attr/file.c
@@ -7,19 +7,21 @@
void test_attr_file__simple_read(void)
{
git_attr_file *file = NULL;
+ git_attr_assignment *assign;
+ git_attr_rule *rule;
cl_git_pass(git_attr_file__from_file(NULL, cl_fixture("attr/attr0"), &file));
cl_assert_strequal(cl_fixture("attr/attr0"), file->path);
cl_assert(file->rules.length == 1);
- git_attr_rule *rule = get_rule(0);
+ rule = get_rule(0);
cl_assert(rule != NULL);
cl_assert_strequal("*", rule->match.pattern);
cl_assert(rule->match.length == 1);
cl_assert(rule->match.flags == 0);
cl_assert(rule->assigns.length == 1);
- git_attr_assignment *assign = get_assign(rule, 0);
+ assign = get_assign(rule, 0);
cl_assert(assign != NULL);
cl_assert_strequal("binary", assign->name);
cl_assert(assign->value == GIT_ATTR_TRUE);