On Fri, Dec 12, 2014 at 12:56 AM, Michael Haggerty <mhagger@xxxxxxxxxxxx> wrote:
> 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@xxxxxxxxx>
> Signed-off-by: Michael Haggerty <mhagger@xxxxxxxxxxxx>
Reviewed-by: Stefan Beller <sbeller@xxxxxxxxxx>
> ---
> builtin/reflog.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/builtin/reflog.c b/builtin/reflog.c
> index 2d85d26..160541a 100644
> --- a/builtin/reflog.c
> +++ b/builtin/reflog.c
> @@ -349,9 +349,9 @@ static int push_tip_to_list(const char *refname, const unsigned char *sha1, int
> return 0;
> }
>
> -static int expire_reflog(const char *ref, const unsigned char *sha1, int unused, void *cb_data)
> +static int expire_reflog(const char *ref, const unsigned char *sha1,
> + struct cmd_reflog_expire_cb *cmd)
> {
> - struct cmd_reflog_expire_cb *cmd = cb_data;
> struct expire_reflog_cb cb;
> struct ref_lock *lock;
> char *log_file, *newlog_path = NULL;
> @@ -663,7 +663,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
> for (i = 0; i < collected.nr; i++) {
> struct collected_reflog *e = collected.e[i];
> set_reflog_expiry_param(&cb, explicit_expiry, e->reflog);
> - status |= expire_reflog(e->reflog, e->sha1, 0, &cb);
> + status |= expire_reflog(e->reflog, e->sha1, &cb);
> free(e);
> }
> free(collected.e);
> @@ -677,7 +677,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
> continue;
> }
> set_reflog_expiry_param(&cb, explicit_expiry, ref);
> - status |= expire_reflog(ref, sha1, 0, &cb);
> + status |= expire_reflog(ref, sha1, &cb);
> }
> return status;
> }
> @@ -748,7 +748,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
> cb.expire_total = 0;
> }
>
> - status |= expire_reflog(ref, sha1, 0, &cb);
> + status |= expire_reflog(ref, sha1, &cb);
> free(ref);
> }
> return status;
> --
> 2.1.3
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html