diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2017-05-30 10:30:39 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-06-02 09:36:06 +0900 |
| commit | 490bc83a01acfefa11e98f8852b1f4a9dd962331 (patch) | |
| tree | 7c081deb55030427a81677559fd80f2a47cbb06e /remote-testsvn.c | |
| parent | notes: convert internal parts to struct object_id (diff) | |
| download | tgif-490bc83a01acfefa11e98f8852b1f4a9dd962331.tar.xz | |
notes: convert for_each_note to struct object_id
Convert for_each_note and each of the callbacks to use struct object_id.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'remote-testsvn.c')
| -rw-r--r-- | remote-testsvn.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/remote-testsvn.c b/remote-testsvn.c index f87bf851ba..793c4ad1d9 100644 --- a/remote-testsvn.c +++ b/remote-testsvn.c @@ -99,8 +99,8 @@ static int parse_rev_note(const char *msg, struct rev_note *res) return -1; } -static int note2mark_cb(const unsigned char *object_sha1, - const unsigned char *note_sha1, char *note_path, +static int note2mark_cb(const struct object_id *object_oid, + const struct object_id *note_oid, char *note_path, void *cb_data) { FILE *file = (FILE *)cb_data; @@ -109,14 +109,14 @@ static int note2mark_cb(const unsigned char *object_sha1, enum object_type type; struct rev_note note; - if (!(msg = read_sha1_file(note_sha1, &type, &msglen)) || + if (!(msg = read_sha1_file(note_oid->hash, &type, &msglen)) || !msglen || type != OBJ_BLOB) { free(msg); return 1; } if (parse_rev_note(msg, ¬e)) return 2; - if (fprintf(file, ":%d %s\n", note.rev_nr, sha1_to_hex(object_sha1)) < 1) + if (fprintf(file, ":%d %s\n", note.rev_nr, oid_to_hex(object_oid)) < 1) return 3; return 0; } |