summaryrefslogtreecommitdiff
path: root/lockfile.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2014-10-01 10:28:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-01 20:53:53 (GMT)
commit316683bd37608e31cc3f5e932c4e5c7dde1b39f0 (patch)
tree018ae64f8578831c7a8c973b123c91b01e9a639b /lockfile.c
parent47ba4662bfd755829edd24428cf2e4bc492d70a6 (diff)
downloadgit-316683bd37608e31cc3f5e932c4e5c7dde1b39f0.zip
git-316683bd37608e31cc3f5e932c4e5c7dde1b39f0.tar.gz
git-316683bd37608e31cc3f5e932c4e5c7dde1b39f0.tar.bz2
lockfile.c: rename static functions
* remove_lock_file() -> remove_lock_files() * remove_lock_file_on_signal() -> remove_lock_files_on_signal() Suggested-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'lockfile.c')
-rw-r--r--lockfile.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lockfile.c b/lockfile.c
index a1cc08a..0a8c3c8 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)