]> granicus.if.org Git - git/commitdiff
lockfile.c: rename static functions
authorMichael Haggerty <mhagger@alum.mit.edu>
Wed, 1 Oct 2014 10:28:38 +0000 (12:28 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 Oct 2014 20:53:53 +0000 (13:53 -0700)
* 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>
lockfile.c

index a1cc08a5ffce7b796ab47f73f9b8de997da369ac..0a8c3c881ee00a184b8bee8c30c3640507e3dfbd 100644 (file)
@@ -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)