summaryrefslogtreecommitdiff
path: root/lockfile.c
diff options
context:
space:
mode:
authorRalf Thielow <ralf.thielow@gmail.com>2015-08-28 16:55:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-08-28 18:32:01 (GMT)
commitaae42e43c42911a3c260ae9fa8681e779c6d5943 (patch)
treedf9b20cbfeb08663d3967571ea6aa43b7cf540b1 /lockfile.c
parentdb86e61cbbc4c59a0886366bbf392498e64b53c8 (diff)
downloadgit-aae42e43c42911a3c260ae9fa8681e779c6d5943.zip
git-aae42e43c42911a3c260ae9fa8681e779c6d5943.tar.gz
git-aae42e43c42911a3c260ae9fa8681e779c6d5943.tar.bz2
lockfile: remove function "hold_lock_file_for_append"
With 77b9b1d (add_to_alternates_file: don't add duplicate entries, 2015-08-10) the last caller of function "hold_lock_file_for_append" has been removed, so we can remove the function as well. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'lockfile.c')
-rw-r--r--lockfile.c38
1 files changed, 0 insertions, 38 deletions
diff --git a/lockfile.c b/lockfile.c
index 637b8cf..80d056d 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -177,44 +177,6 @@ int hold_lock_file_for_update_timeout(struct lock_file *lk, const char *path,
return fd;
}
-int hold_lock_file_for_append(struct lock_file *lk, const char *path, int flags)
-{
- int fd, orig_fd;
-
- fd = lock_file(lk, path, flags);
- if (fd < 0) {
- if (flags & LOCK_DIE_ON_ERROR)
- unable_to_lock_die(path, errno);
- return fd;
- }
-
- orig_fd = open(path, O_RDONLY);
- if (orig_fd < 0) {
- if (errno != ENOENT) {
- int save_errno = errno;
-
- if (flags & LOCK_DIE_ON_ERROR)
- die("cannot open '%s' for copying", path);
- rollback_lock_file(lk);
- error("cannot open '%s' for copying", path);
- errno = save_errno;
- return -1;
- }
- } else if (copy_fd(orig_fd, fd)) {
- int save_errno = errno;
-
- if (flags & LOCK_DIE_ON_ERROR)
- die("failed to prepare '%s' for appending", path);
- close(orig_fd);
- rollback_lock_file(lk);
- errno = save_errno;
- return -1;
- } else {
- close(orig_fd);
- }
- return fd;
-}
-
char *get_locked_file_path(struct lock_file *lk)
{
struct strbuf ret = STRBUF_INIT;