From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
David Turner <novalis@novalis.org>,
Jacob Keller <jacob.keller@gmail.com>,
Philip Oakley <philipoakley@iee.org>,
Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH v4 16/23] log_ref_setup(): manage the name of the reflog file internally
Date: Fri, 6 Jan 2017 17:22:36 +0100 [thread overview]
Message-ID: <196b4cab62f2449a54723fb402138dd5840f3502.1483719289.git.mhagger@alum.mit.edu> (raw)
In-Reply-To: <cover.1483719289.git.mhagger@alum.mit.edu>
Instead of writing the name of the reflog file into a strbuf that is
supplied by the caller but not needed there, write it into a local
temporary buffer and remove the strbuf parameter entirely.
And while we're adjusting the function signature, reorder the arguments
to move the input parameters before the output parameters.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
refs/files-backend.c | 69 ++++++++++++++++++++++++++--------------------------
1 file changed, 34 insertions(+), 35 deletions(-)
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 9c5e804..846380f 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -2719,37 +2719,36 @@ static int open_or_create_logfile(const char *path, void *cb)
}
/*
- * Create a reflog for a ref. Store its path to *logfile. If
- * force_create = 0, only create the reflog for certain refs (those
- * for which should_autocreate_reflog returns non-zero). Otherwise,
- * create it regardless of the reference name. If the logfile already
- * existed or was created, return 0 and set *logfd to the file
- * descriptor opened for appending to the file. If no logfile exists
- * and we decided not to create one, return 0 and set *logfd to -1. On
- * failure, fill in *err, set *logfd to -1, and return -1.
+ * Create a reflog for a ref. If force_create = 0, only create the
+ * reflog for certain refs (those for which should_autocreate_reflog
+ * returns non-zero). Otherwise, create it regardless of the reference
+ * name. If the logfile already existed or was created, return 0 and
+ * set *logfd to the file descriptor opened for appending to the file.
+ * If no logfile exists and we decided not to create one, return 0 and
+ * set *logfd to -1. On failure, fill in *err, set *logfd to -1, and
+ * return -1.
*/
-static int log_ref_setup(const char *refname,
- struct strbuf *logfile, int *logfd,
- struct strbuf *err, int force_create)
+static int log_ref_setup(const char *refname, int force_create,
+ int *logfd, struct strbuf *err)
{
- strbuf_git_path(logfile, "logs/%s", refname);
+ char *logfile = git_pathdup("logs/%s", refname);
if (force_create || should_autocreate_reflog(refname)) {
- if (raceproof_create_file(logfile->buf, open_or_create_logfile, logfd)) {
+ if (raceproof_create_file(logfile, open_or_create_logfile, logfd)) {
if (errno == ENOENT)
strbuf_addf(err, "unable to create directory for '%s': "
- "%s", logfile->buf, strerror(errno));
+ "%s", logfile, strerror(errno));
else if (errno == EISDIR)
strbuf_addf(err, "there are still logs under '%s'",
- logfile->buf);
+ logfile);
else
strbuf_addf(err, "unable to append to '%s': %s",
- logfile->buf, strerror(errno));
+ logfile, strerror(errno));
- return -1;
+ goto error;
}
} else {
- *logfd = open(logfile->buf, O_APPEND | O_WRONLY, 0666);
+ *logfd = open(logfile, O_APPEND | O_WRONLY, 0666);
if (*logfd < 0) {
if (errno == ENOENT || errno == EISDIR) {
/*
@@ -2761,34 +2760,39 @@ static int log_ref_setup(const char *refname,
;
} else {
strbuf_addf(err, "unable to append to '%s': %s",
- logfile->buf, strerror(errno));
- return -1;
+ logfile, strerror(errno));
+ goto error;
}
}
}
if (*logfd >= 0)
- adjust_shared_perm(logfile->buf);
+ adjust_shared_perm(logfile);
+ free(logfile);
return 0;
+
+error:
+ free(logfile);
+ return -1;
}
static int files_create_reflog(struct ref_store *ref_store,
const char *refname, int force_create,
struct strbuf *err)
{
- int ret;
- struct strbuf sb = STRBUF_INIT;
int fd;
/* Check validity (but we don't need the result): */
files_downcast(ref_store, 0, "create_reflog");
- ret = log_ref_setup(refname, &sb, &fd, err, force_create);
+ if (log_ref_setup(refname, force_create, &fd, err))
+ return -1;
+
if (fd >= 0)
close(fd);
- strbuf_release(&sb);
- return ret;
+
+ return 0;
}
static int log_ref_write_fd(int fd, const unsigned char *old_sha1,
@@ -2819,16 +2823,15 @@ static int log_ref_write_fd(int fd, const unsigned char *old_sha1,
static int log_ref_write_1(const char *refname, const unsigned char *old_sha1,
const unsigned char *new_sha1, const char *msg,
- struct strbuf *logfile, int flags,
- struct strbuf *err)
+ int flags, struct strbuf *err)
{
int logfd, result;
if (log_all_ref_updates < 0)
log_all_ref_updates = !is_bare_repository();
- result = log_ref_setup(refname, logfile, &logfd, err,
- flags & REF_FORCE_CREATE_REFLOG);
+ result = log_ref_setup(refname, flags & REF_FORCE_CREATE_REFLOG,
+ &logfd, err);
if (result)
return result;
@@ -2859,11 +2862,7 @@ int files_log_ref_write(const char *refname, const unsigned char *old_sha1,
const unsigned char *new_sha1, const char *msg,
int flags, struct strbuf *err)
{
- struct strbuf sb = STRBUF_INIT;
- int ret = log_ref_write_1(refname, old_sha1, new_sha1, msg, &sb, flags,
- err);
- strbuf_release(&sb);
- return ret;
+ return log_ref_write_1(refname, old_sha1, new_sha1, msg, flags, err);
}
/*
--
2.9.3
next prev parent reply other threads:[~2017-01-06 16:24 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-06 16:22 [PATCH v4 00/23] Delete directories left empty after ref deletion Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 01/23] files_rename_ref(): tidy up whitespace Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 02/23] refname_is_safe(): correct docstring Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 03/23] t5505: use "for-each-ref" to test for the non-existence of references Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 04/23] safe_create_leading_directories_const(): preserve errno Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 05/23] safe_create_leading_directories(): set errno on SCLD_EXISTS Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 06/23] raceproof_create_file(): new function Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 07/23] lock_ref_sha1_basic(): inline constant Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 08/23] lock_ref_sha1_basic(): use raceproof_create_file() Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 09/23] rename_tmp_log(): " Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 10/23] rename_tmp_log(): improve error reporting Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 11/23] log_ref_write(): inline function Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 12/23] log_ref_setup(): separate code for create vs non-create Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 13/23] log_ref_setup(): improve robustness against races Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 14/23] log_ref_setup(): pass the open file descriptor back to the caller Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 15/23] log_ref_write_1(): don't depend on logfile argument Michael Haggerty
2017-01-06 16:22 ` Michael Haggerty [this message]
2017-01-06 16:22 ` [PATCH v4 17/23] log_ref_write_1(): inline function Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 18/23] delete_ref_loose(): derive loose reference path from lock Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 19/23] delete_ref_loose(): inline function Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 20/23] try_remove_empty_parents(): rename parameter "name" -> "refname" Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 21/23] try_remove_empty_parents(): don't trash argument contents Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 22/23] try_remove_empty_parents(): teach to remove parents of reflogs, too Michael Haggerty
2017-01-06 16:22 ` [PATCH v4 23/23] files_transaction_commit(): clean up empty directories Michael Haggerty
2017-01-06 19:44 ` [PATCH v4 00/23] Delete directories left empty after ref deletion Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=196b4cab62f2449a54723fb402138dd5840f3502.1483719289.git.mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=novalis@novalis.org \
--cc=peff@peff.net \
--cc=philipoakley@iee.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).