[PATCH 18/23] Move newlog and last_kept_sha1 to "struct expire_reflog_cb"

[Michael Haggerty]

These members are not needed by the policy functions.

Signed-off-by: Michael Haggerty <mhag...@alum.mit.edu>
---
 builtin/reflog.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/builtin/reflog.c b/builtin/reflog.c
index 6294406..01b76d0 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -36,7 +36,6 @@ struct cmd_reflog_expire_cb {
 };
 
 struct expire_reflog_policy_cb {
-       FILE *newlog;
        enum {
                UE_NORMAL,
                UE_ALWAYS,
@@ -45,7 +44,6 @@ struct expire_reflog_policy_cb {
        struct commit_list *mark_list;
        unsigned long mark_limit;
        struct cmd_reflog_expire_cb *cmd;
-       unsigned char last_kept_sha1[20];
        struct commit *tip_commit;
        struct commit_list *tips;
 };
@@ -53,6 +51,8 @@ struct expire_reflog_policy_cb {
 struct expire_reflog_cb {
        unsigned int flags;
        void *policy_cb;
+       FILE *newlog;
+       unsigned char last_kept_sha1[20];
 };
 
 struct collected_reflog {
@@ -338,23 +338,23 @@ static int expire_reflog_ent(unsigned char *osha1, 
unsigned char *nsha1,
        struct expire_reflog_policy_cb *policy_cb = cb->policy_cb;
 
        if (cb->flags & EXPIRE_REFLOGS_REWRITE)
-               osha1 = policy_cb->last_kept_sha1;
+               osha1 = cb->last_kept_sha1;
 
        if (should_expire_reflog_ent(osha1, nsha1, email, timestamp, tz,
                                     message, policy_cb)) {
-               if (!policy_cb->newlog)
+               if (!cb->newlog)
                        printf("would prune %s", message);
                else if (cb->flags & EXPIRE_REFLOGS_VERBOSE)
                        printf("prune %s", message);
        } else {
-               if (policy_cb->newlog) {
+               if (cb->newlog) {
                        char sign = (tz < 0) ? '-' : '+';
                        int zone = (tz < 0) ? (-tz) : tz;
-                       fprintf(policy_cb->newlog, "%s %s %s %lu %c%04d\t%s",
+                       fprintf(cb->newlog, "%s %s %s %lu %c%04d\t%s",
                                sha1_to_hex(osha1), sha1_to_hex(nsha1),
                                email, timestamp, sign, zone,
                                message);
-                       hashcpy(policy_cb->last_kept_sha1, nsha1);
+                       hashcpy(cb->last_kept_sha1, nsha1);
                }
                if (cb->flags & EXPIRE_REFLOGS_VERBOSE)
                        printf("keep %s", message);
@@ -457,8 +457,8 @@ static int expire_reflog(const char *refname, const 
unsigned char *sha1,
        if (!(flags & EXPIRE_REFLOGS_DRY_RUN)) {
                if (hold_lock_file_for_update(&reflog_lock, log_file, 0) < 0)
                        goto failure;
-               policy_cb.newlog = fdopen_lock_file(&reflog_lock, "w");
-               if (!policy_cb.newlog)
+               cb.newlog = fdopen_lock_file(&reflog_lock, "w");
+               if (!cb.newlog)
                        goto failure;
        }
 
@@ -474,7 +474,7 @@ static int expire_reflog(const char *refname, const 
unsigned char *sha1,
                                        strerror(errno));
                } else if ((flags & EXPIRE_REFLOGS_UPDATE_REF) &&
                        (write_in_full(lock->lock_fd,
-                               sha1_to_hex(policy_cb.last_kept_sha1), 40) != 
40 ||
+                               sha1_to_hex(cb.last_kept_sha1), 40) != 40 ||
                         write_str_in_full(lock->lock_fd, "\n") != 1 ||
                         close_ref(lock) < 0)) {
                        status |= error("Couldn't write %s",
-- 
2.1.3

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html