From: Alex Riesen <raa.lkml@gmail.com>
To: git@vger.kernel.org
Cc: "Shawn O. Pearce" <spearce@spearce.org>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH] Cleanup remove_path
Date: Thu, 25 Sep 2008 22:17:34 +0200 [thread overview]
Message-ID: <20080925201734.GA18315@blimp.localhost> (raw)
In-Reply-To: <20080925201245.GB3959@blimp.localhost>
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
While at it, could we cleanup the remove_file routines a little?
builtin-merge-recursive.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index a29b47f..dc9652d 100644
--- a/builtin-merge-recursive.c
+++ b/builtin-merge-recursive.c
@@ -418,12 +418,10 @@ static int update_stages(const char *path, struct diff_filespec *o,
static int remove_path(const char *name)
{
- int ret;
char *slash, *dirs;
- ret = unlink(name);
- if (ret)
- return ret;
+ if (unlink(name))
+ return -1;
dirs = xstrdup(name);
while ((slash = strrchr(name, '/'))) {
*slash = '\0';
@@ -431,7 +429,7 @@ static int remove_path(const char *name)
break;
}
free(dirs);
- return ret;
+ return 0;
}
static int remove_file(int clean, const char *path, int no_wd)
--
1.6.0.2.328.g14651
next prev parent reply other threads:[~2008-09-25 20:18 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-24 16:32 [BUG] git merge does not prune empty directories Anders Melchiorsen
2008-09-25 20:12 ` [PATCH] Remove empty directories in recursive merge Alex Riesen
2008-09-25 20:17 ` Alex Riesen [this message]
2008-09-25 20:22 ` [PATCH] Fix memleak and the implementation of remove_file in builtin-rm.c Alex Riesen
2008-09-26 15:28 ` Shawn O. Pearce
2008-09-26 22:56 ` [PATCH] Add remove_path: a function to remove as much as possible of a path Alex Riesen
2008-09-26 22:59 ` [PATCH] Use remove_path from dir.c instead of own implementation Alex Riesen
2008-09-25 20:33 ` [PATCH] Remove empty directories in recursive merge Alex Riesen
2008-09-26 15:06 ` Shawn O. Pearce
2008-09-26 5:58 ` Johannes Sixt
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=20080925201734.GA18315@blimp.localhost \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=spearce@spearce.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.
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).