From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: "Stefan Beller" <stefanbeller@googlemail•com>,
"Torsten Bögershausen" <tboegi@web•de>,
git@vger•kernel.org
Subject: Re: [PATCH] repack.c: rename and unlink pack file if it exists
Date: Wed, 05 Feb 2014 12:10:23 -0800 [thread overview]
Message-ID: <xmqqwqh92uds.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140205011632.GA3923@sigill.intra.peff.net> (Jeff King's message of "Tue, 4 Feb 2014 20:16:32 -0500")
... and this is the other half that is supposed to be only about
renaming variables.
-- >8 --
From: Torsten Bögershausen <tboegi@web•de>
Date: Sun, 2 Feb 2014 16:09:56 +0100
Subject: [PATCH] repack.c: rename a few variables
Rename the variables to match what they are used for: fname for the
final name of the new packfile, fname_old for the name of the
existing one, and fname_tmp for the temporary name pack-objects
created the new packfile in.
Signed-off-by: Torsten Bögershausen <tboegi@web•de>
Signed-off-by: Junio C Hamano <gitster@pobox•com>
---
builtin/repack.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/builtin/repack.c b/builtin/repack.c
index fe31577..3b01353 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -316,33 +316,33 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
/* Now the ones with the same name are out of the way... */
for_each_string_list_item(item, &names) {
for (ext = 0; ext < 2; ext++) {
- char *fname, *fname_old;
+ char *fname, *fname_tmp;
struct stat statbuffer;
fname = mkpathdup("%s/pack-%s%s",
packdir, item->string, exts[ext]);
- fname_old = mkpathdup("%s-%s%s",
+ fname_tmp = mkpathdup("%s-%s%s",
packtmp, item->string, exts[ext]);
- if (!stat(fname_old, &statbuffer)) {
+ if (!stat(fname_tmp, &statbuffer)) {
statbuffer.st_mode &= ~(S_IWUSR | S_IWGRP | S_IWOTH);
- chmod(fname_old, statbuffer.st_mode);
+ chmod(fname_tmp, statbuffer.st_mode);
}
- if (rename(fname_old, fname))
- die_errno(_("renaming '%s' failed"), fname_old);
+ if (rename(fname_tmp, fname))
+ die_errno(_("renaming '%s' into '%s' failed"), fname_tmp, fname);
free(fname);
- free(fname_old);
+ free(fname_tmp);
}
}
/* Remove the "old-" files */
for_each_string_list_item(item, &names) {
for (ext = 0; ext < 2; ext++) {
- char *fname;
- fname = mkpath("%s/old-%s%s",
+ char *fname_old;
+ fname_old = mkpath("%s/old-%s%s",
packdir,
item->string,
exts[ext]);
- if (remove_path(fname))
- warning(_("removing '%s' failed"), fname);
+ if (remove_path(fname_old))
+ warning(_("removing '%s' failed"), fname_old);
}
}
--
1.9-rc2-217-g24a8b2e
prev parent reply other threads:[~2014-02-05 20:10 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-04 23:40 [PATCH] repack.c: rename and unlink pack file if it exists Junio C Hamano
2014-02-04 23:43 ` Junio C Hamano
2014-02-05 1:16 ` Jeff King
2014-02-05 17:54 ` Torsten Bögershausen
2014-02-05 20:06 ` Junio C Hamano
2014-02-05 20:12 ` Jeff King
2014-02-05 20:31 ` Junio C Hamano
2014-02-05 20:37 ` Jeff King
2014-02-05 20:54 ` Jeff King
2014-02-05 20:57 ` Junio C Hamano
2014-02-05 21:01 ` Jeff King
2014-02-05 21:08 ` Junio C Hamano
2014-02-05 21:09 ` Jeff King
2014-02-05 21:01 ` Torsten Bögershausen
2014-02-05 20:10 ` Junio C Hamano [this message]
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=xmqqwqh92uds.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=peff@peff$(echo .)net \
--cc=stefanbeller@googlemail$(echo .)com \
--cc=tboegi@web$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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