From 316683bd37608e31cc3f5e932c4e5c7dde1b39f0 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Wed, 1 Oct 2014 12:28:38 +0200 Subject: [PATCH] lockfile.c: rename static functions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * remove_lock_file() -> remove_lock_files() * remove_lock_file_on_signal() -> remove_lock_files_on_signal() Suggested-by: Torsten Bögershausen Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- lockfile.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lockfile.c b/lockfile.c index a1cc08a5ff..0a8c3c881e 100644 --- a/lockfile.c +++ b/lockfile.c @@ -57,7 +57,7 @@ static struct lock_file *volatile lock_file_list; -static void remove_lock_file(void) +static void remove_lock_files(void) { pid_t me = getpid(); @@ -68,9 +68,9 @@ static void remove_lock_file(void) } } -static void remove_lock_file_on_signal(int signo) +static void remove_lock_files_on_signal(int signo) { - remove_lock_file(); + remove_lock_files(); sigchain_pop(signo); raise(signo); } @@ -146,8 +146,8 @@ static int lock_file(struct lock_file *lk, const char *path, int flags) if (!lock_file_list) { /* One-time initialization */ - sigchain_push_common(remove_lock_file_on_signal); - atexit(remove_lock_file); + sigchain_push_common(remove_lock_files_on_signal); + atexit(remove_lock_files); } if (lk->active) -- 2.11.4.GIT