From: Peter Collingbourne Date: Fri, 26 Mar 2010 15:25:33 GMT Subject: [PATCH 05/12] Implement the rmdir_or_warn function Message-ID: <1269617140-7827-6-git-send-email-peter@pcc.me.uk> In-Reply-To: <1269617140-7827-1-git-send-email-peter@pcc.me.uk> This patch implements an rmdir_or_warn function (like unlink_or_warn but for directories) that uses the generalised warning code in warn_if_unremovable. Signed-off-by: Peter Collingbourne --- git-compat-util.h | 4 ++++ wrapper.c | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/git-compat-util.h b/git-compat-util.h index a3c4537..67ea4c8 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -469,5 +469,9 @@ void git_qsort(void *base, size_t nmemb, size_t size, * Always returns the return value of unlink(2). */ int unlink_or_warn(const char *path); +/* + * Likewise for rmdir(2). + */ +int rmdir_or_warn(const char *path); #endif diff --git a/wrapper.c b/wrapper.c index 0bbff56..4017bff 100644 --- a/wrapper.c +++ b/wrapper.c @@ -328,3 +328,8 @@ int unlink_or_warn(const char *file) { return warn_if_unremovable("unlink", file, unlink(file)); } + +int rmdir_or_warn(const char *file) +{ + return warn_if_unremovable("rmdir", file, rmdir(file)); +} -- 1.6.5