summaryrefslogtreecommitdiff
path: root/src/notes.c
diff options
context:
space:
mode:
authorVicent Marti <tanoku@gmail.com>2012-08-02 01:38:30 +0200
committerVicent Marti <tanoku@gmail.com>2012-08-02 01:38:30 +0200
commite25dda51c4dc47ed99f95dae6486c6275b119484 (patch)
tree183114622aa2dfeb224b550a07050f26cd9a0732 /src/notes.c
parent95a1d876148ff2e09c13537c60e1dc7e10ea9295 (diff)
parentb8457baae24269c9fb777591e2a0e1b425ba31b6 (diff)
downloadlibgit2-e25dda51c4dc47ed99f95dae6486c6275b119484.tar.gz
Merge remote-tracking branch 'nulltoken/topic/amd64-compat' into development
Conflicts: src/netops.c src/netops.h src/oid.c
Diffstat (limited to 'src/notes.c')
-rw-r--r--src/notes.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/notes.c b/src/notes.c
index 7813e9985..37d5f59cc 100644
--- a/src/notes.c
+++ b/src/notes.c
@@ -522,7 +522,8 @@ static int process_entry_path(
int (*note_cb)(git_note_data *note_data, void *payload),
void *payload)
{
- int i = 0, j = 0, error = -1, len;
+ int error = -1;
+ size_t i = 0, j = 0, len;
git_buf buf = GIT_BUF_INIT;
git_note_data note_data;