From: Stefan Beller <sbeller@google.com>
To: jrnieder@gmail.com, git@vger.kernel.org
Subject: [PATCH 2/4] refs.c: rename transaction.updates to ref_updates
Date: Mon, 1 Dec 2014 18:02:30 -0800 [thread overview]
Message-ID: <1417485752-10502-2-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1417485752-10502-1-git-send-email-sbeller@google.com>
The updates are only holding refs not reflogs, so express it to the reader.
Change-Id: Ifdc87722f0e7314f3d0febb970aa7769eada6d33
Signed-off-by: Stefan Beller <sbeller@google.com>
---
refs.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/refs.c b/refs.c
index f0f0d23..58de60c 100644
--- a/refs.c
+++ b/refs.c
@@ -3554,7 +3554,7 @@ enum transaction_state {
* as atomically as possible. This structure is opaque to callers.
*/
struct transaction {
- struct ref_update **updates;
+ struct ref_update **ref_updates;
size_t alloc;
size_t nr;
enum transaction_state state;
@@ -3575,10 +3575,10 @@ void transaction_free(struct transaction *transaction)
return;
for (i = 0; i < transaction->nr; i++) {
- free(transaction->updates[i]->msg);
- free(transaction->updates[i]);
+ free(transaction->ref_updates[i]->msg);
+ free(transaction->ref_updates[i]);
}
- free(transaction->updates);
+ free(transaction->ref_updates);
free(transaction);
}
@@ -3589,8 +3589,8 @@ static struct ref_update *add_update(struct transaction *transaction,
struct ref_update *update = xcalloc(1, sizeof(*update) + len + 1);
strcpy((char *)update->refname, refname);
- ALLOC_GROW(transaction->updates, transaction->nr + 1, transaction->alloc);
- transaction->updates[transaction->nr++] = update;
+ ALLOC_GROW(transaction->ref_updates, transaction->nr + 1, transaction->alloc);
+ transaction->ref_updates[transaction->nr++] = update;
return update;
}
@@ -3712,7 +3712,7 @@ int transaction_commit(struct transaction *transaction,
int ret = 0, delnum = 0, i;
const char **delnames;
int n = transaction->nr;
- struct ref_update **updates = transaction->updates;
+ struct ref_update **updates = transaction->ref_updates;
assert(err);
--
2.2.0
next prev parent reply other threads:[~2014-12-02 2:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-02 2:02 [PATCH 1/4] refs.c: rename the transaction functions Stefan Beller
2014-12-02 2:02 ` Stefan Beller [this message]
2014-12-02 2:02 ` [PATCH 3/4] refs.c: add a transaction function to append a reflog entry Stefan Beller
2014-12-02 2:02 ` [PATCH 4/4] reflog.c: use a reflog transaction when writing during expire Stefan Beller
2014-12-02 2:05 ` [PATCH 1/4] refs.c: rename the transaction functions Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1417485752-10502-2-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).