undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

foreach_alt_odb: propagate return value from callback

Browse Source 
We check the return value of the callback and stop iterating
if it is non-zero. However, we do not make the non-zero
return value available to the caller, so they have no way of
knowing whether the operation succeeded or not (technically
they can keep their own error flag in the callback data, but
that is unlike our other for_each functions).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2014-10-15 18:33:13 -04:00 committed by Junio C Hamano
parent a136f6d8ff
commit fe1b22686f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cache.h
View File

@ -1143,7 +1143,7 @@ extern void prepare_alt_odb(void);
extern void read_info_alternates(const char * relative_base, int depth); extern void read_info_alternates(const char * relative_base, int depth);
extern void add_to_alternates_file(const char *reference); extern void add_to_alternates_file(const char *reference);
typedef int alt_odb_fn(struct alternate_object_database *, void *); typedef int alt_odb_fn(struct alternate_object_database *, void *);
extern void foreach_alt_odb(alt_odb_fn, void*); extern int foreach_alt_odb(alt_odb_fn, void*);
struct pack_window { struct pack_window {
struct pack_window *next; struct pack_window *next;

12
sha1_file.c
View File

@ -412,14 +412,18 @@ void add_to_alternates_file(const char *reference)
link_alt_odb_entries(alt, strlen(alt), '\n', NULL, 0); link_alt_odb_entries(alt, strlen(alt), '\n', NULL, 0);
} }
void foreach_alt_odb(alt_odb_fn fn, void *cb) int foreach_alt_odb(alt_odb_fn fn, void *cb)
{ {
struct alternate_object_database *ent; struct alternate_object_database *ent;
int r = 0;
prepare_alt_odb(); prepare_alt_odb();
for (ent = alt_odb_list; ent; ent = ent->next) for (ent = alt_odb_list; ent; ent = ent->next) {
if (fn(ent, cb)) r = fn(ent, cb);
return; if (r)
break;
}
return r;
} }
void prepare_alt_odb(void) void prepare_alt_odb(void)