[PATCH 04/12] Generalise the unlink_or_warn function

From

Peter Collingbourne <peter@pcc.me.uk>

Date

Mar 26, 2010, 15:25 UTC

Message-ID

<1269617140-7827-5-git-send-email-peter@pcc.me.uk>

In-Reply-To

<1269617140-7827-1-git-send-email-peter@pcc.me.uk>

Signed-off-by: Peter Collingbourne <peter@pcc.me.uk>
---
 wrapper.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/wrapper.c b/wrapper.c
index 9c71b21..0bbff56 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -311,18 +311,20 @@ int odb_pack_keep(char *name, size_t namesz, unsigned char *sha1)
 	return open(name, O_RDWR|O_CREAT|O_EXCL, 0600);
 }
 
-int unlink_or_warn(const char *file)
+static int warn_if_unremovable(const char *op, const char *file, int rc)
 {
-	int rc = unlink(file);
-
 	if (rc < 0) {
 		int err = errno;
 		if (ENOENT != err) {
-			warning("unable to unlink %s: %s",
-				file, strerror(errno));
+			warning("unable to %s %s: %s",
+				op, file, strerror(errno));
 			errno = err;
 		}
 	}
 	return rc;
 }
 
+int unlink_or_warn(const char *file)
+{
+	return warn_if_unremovable("unlink", file, unlink(file));
+}

-- 
1.6.5