Re: [PATCH 13/23] Rename expire_reflog_cb to expire_reflog_policy_cb

2014-12-08 Thread Stefan Beller 
On Fri, Dec 05, 2014 at 12:08:25AM +0100, Michael Haggerty wrote:
 This is the first step towards separating the data needed by the
 policy code from the data needed by the reflog expiration machinery.
 
 Signed-off-by: Michael Haggerty mhag...@alum.mit.edu

Reviewed-by: sbel...@google.com
 ---
  builtin/reflog.c | 19 ++-
  1 file changed, 10 insertions(+), 9 deletions(-)
 
 diff --git a/builtin/reflog.c b/builtin/reflog.c
 index 597c547..3538e4b 100644
 --- a/builtin/reflog.c
 +++ b/builtin/reflog.c
 @@ -30,7 +30,7 @@ struct cmd_reflog_expire_cb {
   int recno;
  };
  
 -struct expire_reflog_cb {
 +struct expire_reflog_policy_cb {
   FILE *newlog;
   enum {
   UE_NORMAL,
 @@ -220,7 +220,7 @@ static int keep_entry(struct commit **it, unsigned char 
 *sha1)
   * the expire_limit and queue them back, so that the caller can call
   * us again to restart the traversal with longer expire_limit.
   */
 -static void mark_reachable(struct expire_reflog_cb *cb)
 +static void mark_reachable(struct expire_reflog_policy_cb *cb)
  {
   struct commit *commit;
   struct commit_list *pending;
 @@ -259,7 +259,7 @@ static void mark_reachable(struct expire_reflog_cb *cb)
   cb-mark_list = leftover;
  }
  
 -static int unreachable(struct expire_reflog_cb *cb, struct commit *commit, 
 unsigned char *sha1)
 +static int unreachable(struct expire_reflog_policy_cb *cb, struct commit 
 *commit, unsigned char *sha1)
  {
   /*
* We may or may not have the commit yet - if not, look it
 @@ -295,7 +295,7 @@ static int should_expire_reflog_ent(unsigned char *osha1, 
 unsigned char *nsha1,
   const char *email, unsigned long timestamp, 
 int tz,
   const char *message, void *cb_data)
  {
 - struct expire_reflog_cb *cb = cb_data;
 + struct expire_reflog_policy_cb *cb = cb_data;
   struct commit *old, *new;
  
   if (timestamp  cb-cmd-expire_total)
 @@ -323,7 +323,7 @@ static int expire_reflog_ent(unsigned char *osha1, 
 unsigned char *nsha1,
   const char *email, unsigned long timestamp, int tz,
   const char *message, void *cb_data)
  {
 - struct expire_reflog_cb *cb = cb_data;
 + struct expire_reflog_policy_cb *cb = cb_data;
  
   if (cb-cmd-rewrite)
   osha1 = cb-last_kept_sha1;
 @@ -350,7 +350,8 @@ static int expire_reflog_ent(unsigned char *osha1, 
 unsigned char *nsha1,
   return 0;
  }
  
 -static int push_tip_to_list(const char *refname, const unsigned char *sha1, 
 int flags, void *cb_data)
 +static int push_tip_to_list(const char *refname, const unsigned char *sha1,
 + int flags, void *cb_data)
  {
   struct commit_list **list = cb_data;
   struct commit *tip_commit;
 @@ -365,7 +366,7 @@ static int push_tip_to_list(const char *refname, const 
 unsigned char *sha1, int
  
  static void reflog_expiry_prepare(const char *refname,
 const unsigned char *sha1,
 -   struct expire_reflog_cb *cb)
 +   struct expire_reflog_policy_cb *cb)
  {
   if (!cb-cmd-expire_unreachable || !strcmp(refname, HEAD)) {
   cb-tip_commit = NULL;
 @@ -397,7 +398,7 @@ static void reflog_expiry_prepare(const char *refname,
   }
  }
  
 -static void reflog_expiry_cleanup(struct expire_reflog_cb *cb)
 +static void reflog_expiry_cleanup(struct expire_reflog_policy_cb *cb)
  {
   if (cb-unreachable_expire_kind != UE_ALWAYS) {
   if (cb-unreachable_expire_kind == UE_HEAD) {
 @@ -422,7 +423,7 @@ static int expire_reflog(const char *refname, const 
 unsigned char *sha1,
unsigned int flags, void *cb_data)
  {
   struct cmd_reflog_expire_cb *cmd = cb_data;
 - struct expire_reflog_cb cb;
 + struct expire_reflog_policy_cb cb;
   struct ref_lock *lock;
   char *log_file;
   int status = 0;
 -- 
 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

[PATCH 13/23] Rename expire_reflog_cb to expire_reflog_policy_cb

2014-12-04 Thread Michael Haggerty 
This is the first step towards separating the data needed by the
policy code from the data needed by the reflog expiration machinery.

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

diff --git a/builtin/reflog.c b/builtin/reflog.c
index 597c547..3538e4b 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -30,7 +30,7 @@ struct cmd_reflog_expire_cb {
int recno;
 };
 
-struct expire_reflog_cb {
+struct expire_reflog_policy_cb {
FILE *newlog;
enum {
UE_NORMAL,
@@ -220,7 +220,7 @@ static int keep_entry(struct commit **it, unsigned char 
*sha1)
  * the expire_limit and queue them back, so that the caller can call
  * us again to restart the traversal with longer expire_limit.
  */
-static void mark_reachable(struct expire_reflog_cb *cb)
+static void mark_reachable(struct expire_reflog_policy_cb *cb)
 {
struct commit *commit;
struct commit_list *pending;
@@ -259,7 +259,7 @@ static void mark_reachable(struct expire_reflog_cb *cb)
cb-mark_list = leftover;
 }
 
-static int unreachable(struct expire_reflog_cb *cb, struct commit *commit, 
unsigned char *sha1)
+static int unreachable(struct expire_reflog_policy_cb *cb, struct commit 
*commit, unsigned char *sha1)
 {
/*
 * We may or may not have the commit yet - if not, look it
@@ -295,7 +295,7 @@ static int should_expire_reflog_ent(unsigned char *osha1, 
unsigned char *nsha1,
const char *email, unsigned long timestamp, 
int tz,
const char *message, void *cb_data)
 {
-   struct expire_reflog_cb *cb = cb_data;
+   struct expire_reflog_policy_cb *cb = cb_data;
struct commit *old, *new;
 
if (timestamp  cb-cmd-expire_total)
@@ -323,7 +323,7 @@ static int expire_reflog_ent(unsigned char *osha1, unsigned 
char *nsha1,
const char *email, unsigned long timestamp, int tz,
const char *message, void *cb_data)
 {
-   struct expire_reflog_cb *cb = cb_data;
+   struct expire_reflog_policy_cb *cb = cb_data;
 
if (cb-cmd-rewrite)
osha1 = cb-last_kept_sha1;
@@ -350,7 +350,8 @@ static int expire_reflog_ent(unsigned char *osha1, unsigned 
char *nsha1,
return 0;
 }
 
-static int push_tip_to_list(const char *refname, const unsigned char *sha1, 
int flags, void *cb_data)
+static int push_tip_to_list(const char *refname, const unsigned char *sha1,
+   int flags, void *cb_data)
 {
struct commit_list **list = cb_data;
struct commit *tip_commit;
@@ -365,7 +366,7 @@ static int push_tip_to_list(const char *refname, const 
unsigned char *sha1, int
 
 static void reflog_expiry_prepare(const char *refname,
  const unsigned char *sha1,
- struct expire_reflog_cb *cb)
+ struct expire_reflog_policy_cb *cb)
 {
if (!cb-cmd-expire_unreachable || !strcmp(refname, HEAD)) {
cb-tip_commit = NULL;
@@ -397,7 +398,7 @@ static void reflog_expiry_prepare(const char *refname,
}
 }
 
-static void reflog_expiry_cleanup(struct expire_reflog_cb *cb)
+static void reflog_expiry_cleanup(struct expire_reflog_policy_cb *cb)
 {
if (cb-unreachable_expire_kind != UE_ALWAYS) {
if (cb-unreachable_expire_kind == UE_HEAD) {
@@ -422,7 +423,7 @@ static int expire_reflog(const char *refname, const 
unsigned char *sha1,
 unsigned int flags, void *cb_data)
 {
struct cmd_reflog_expire_cb *cmd = cb_data;
-   struct expire_reflog_cb cb;
+   struct expire_reflog_policy_cb cb;
struct ref_lock *lock;
char *log_file;
int status = 0;
-- 
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