@matheusbsbs / matheus-bagliano / commits / 55dfc8de18

expire_reflog(): it's not an each_ref_fn anymore

Prior to v1.5.4~14, expire_reflog() had to be an each_ref_fn because it was passed to for_each_reflog(). Since then, there has been no reason for it to implement the each_ref_fn interface. So... * Remove the "unused" parameter (which took the place of "flags", but was really unused). * Declare the last parameter to be (struct cmd_reflog_expire_cb *) rather than (void *). Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Michael Haggerty committed Dec 12, 2014 at 09:56 UTC 55dfc8de1844e4295bc02d4a279a432e26dc4740

1 file changed +5 -5

builtin/reflog.c

+5 -5

@@ -349,9 +349,9 @@ static int push_tip_to_list(const char *refname, const unsigned char *sha1, int

349 return 0;

350 }

351

352 -static int expire_reflog(const char *ref, const unsigned char *sha1, int unused, void *cb_data)

352 +static int expire_reflog(const char *ref, const unsigned char *sha1,

353 + struct cmd_reflog_expire_cb *cmd)

354 {

354 - struct cmd_reflog_expire_cb *cmd = cb_data;

355 struct expire_reflog_cb cb;

356 struct ref_lock *lock;

357 char *log_file, *newlog_path = NULL;

@@ -663,7 +663,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)

663 for (i = 0; i < collected.nr; i++) {

664 struct collected_reflog *e = collected.e[i];

665 set_reflog_expiry_param(&cb, explicit_expiry, e->reflog);

666 - status |= expire_reflog(e->reflog, e->sha1, 0, &cb);

666 + status |= expire_reflog(e->reflog, e->sha1, &cb);

667 free(e);

668 }

669 free(collected.e);

@@ -677,7 +677,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)

677 continue;

678 }

679 set_reflog_expiry_param(&cb, explicit_expiry, ref);

680 - status |= expire_reflog(ref, sha1, 0, &cb);

680 + status |= expire_reflog(ref, sha1, &cb);

681 }

682 return status;

683 }

@@ -748,7 +748,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)

748 cb.expire_total = 0;

749 }

750

751 - status |= expire_reflog(ref, sha1, 0, &cb);

751 + status |= expire_reflog(ref, sha1, &cb);

752 free(ref);

753 }

754 return status;