diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-09-21 04:47:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-21 04:47:42 (GMT) |
| commit | cb5d709ff8a4bae19d57a470ba2b137c25938a44 (patch) | |
| tree | d64f4ca2150e36ed77e30df9a3c4261028d26ad2 /builtin-pack-refs.c | |
| parent | cc4c4f0ce25cc3803197bc19c275fd6f59a2a511 (diff) | |
| download | git-cb5d709ff8a4bae19d57a470ba2b137c25938a44.zip git-cb5d709ff8a4bae19d57a470ba2b137c25938a44.tar.gz git-cb5d709ff8a4bae19d57a470ba2b137c25938a44.tar.bz2 | |
Add callback data to for_each_ref() family.
This is a long overdue fix to the API for for_each_ref() family
of functions. It allows the callers to specify a callback data
pointer, so that the caller does not have to use static
variables to communicate with the callback funciton.
The updated for_each_ref() family takes a function of type
int (*fn)(const char *, const unsigned char *, void *)
and a void pointer as parameters, and calls the function with
the name of the ref and its SHA-1 with the caller-supplied void
pointer as parameters.
The commit updates two callers, builtin-name-rev.c and
builtin-pack-refs.c as an example.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-pack-refs.c')
| -rw-r--r-- | builtin-pack-refs.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/builtin-pack-refs.c b/builtin-pack-refs.c index 0f5d827..b3d5470 100644 --- a/builtin-pack-refs.c +++ b/builtin-pack-refs.c @@ -1,7 +1,6 @@ #include "cache.h" #include "refs.h" -static FILE *refs_file; static const char *result_path, *lock_path; static void remove_lock_file(void) @@ -10,8 +9,10 @@ static void remove_lock_file(void) unlink(lock_path); } -static int handle_one_ref(const char *path, const unsigned char *sha1) +static int handle_one_ref(const char *path, const unsigned char *sha1, void *cb_data) { + FILE *refs_file = cb_data; + fprintf(refs_file, "%s %s\n", sha1_to_hex(sha1), path); return 0; } @@ -19,6 +20,7 @@ static int handle_one_ref(const char *path, const unsigned char *sha1) int cmd_pack_refs(int argc, const char **argv, const char *prefix) { int fd; + FILE *refs_file; result_path = xstrdup(git_path("packed-refs")); lock_path = xstrdup(mkpath("%s.lock", result_path)); @@ -31,7 +33,7 @@ int cmd_pack_refs(int argc, const char **argv, const char *prefix) refs_file = fdopen(fd, "w"); if (!refs_file) die("unable to create ref-pack file structure (%s)", strerror(errno)); - for_each_ref(handle_one_ref); + for_each_ref(handle_one_ref, refs_file); fsync(fd); fclose(refs_file); if (rename(lock_path, result_path) < 0) |