diff options
| author | Vicent Martà <tanoku@gmail.com> | 2012-01-04 12:34:59 -0800 |
|---|---|---|
| committer | Vicent Martà <tanoku@gmail.com> | 2012-01-04 12:34:59 -0800 |
| commit | b0df89d90b4c2aee6e7083031a93667ff9c85ab3 (patch) | |
| tree | 3fc9ecde94ca9ffbe72705bbb11a4bc279c36edd /src | |
| parent | 7d93f96aa90c22fa7ebcbc954ad71e1cfed7013e (diff) | |
| parent | f46e622636c5196829329f7bcf2226b36e61f7ed (diff) | |
| download | libgit2-b0df89d90b4c2aee6e7083031a93667ff9c85ab3.tar.gz | |
Merge pull request #526 from nulltoken/fix/attr
Fix some "attributes" related issues
Diffstat (limited to 'src')
| -rw-r--r-- | src/attr.c | 2 | ||||
| -rw-r--r-- | src/fileops.c | 2 |
2 files changed, 2 insertions, 2 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/src/fileops.c b/src/fileops.c index 5eb7bf6ec..48bd3514d 100644 --- a/src/fileops.c +++ b/src/fileops.c @@ -486,7 +486,7 @@ static int win32_find_system_file(git_buf *path, const char *filename) filename++; if (gitwin_append_utf16(file_utf16 + root->len - 1, filename, len + 1) != - (int)len) { + (int)len + 1) { error = git__throw(GIT_EOSERR, "Failed to build file path"); goto cleanup; } |