lockfile.c: rename static functions

mhagger · gitster · commit 316683bd3760 · 2014-10-01T13:53:53.000-07:00
* remove_lock_file() -&gt; remove_lock_files()
* remove_lock_file_on_signal() -&gt; remove_lock_files_on_signal()

Suggested-by: Torsten Bögershausen &lt;tboegi@web.de&gt;
Signed-off-by: Michael Haggerty &lt;mhagger@alum.mit.edu&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@`
`57`	`57`
`58`	`58`	`static struct lock_file *volatile lock_file_list;`
`59`	`59`
`60`		`-static void remove_lock_file(void)`
	`60`	`+static void remove_lock_files(void)`
`61`	`61`	`{`
`62`	`62`	`pid_t me = getpid();`
`63`	`63`
`@@ -68,9 +68,9 @@ static void remove_lock_file(void)`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`71`		`-static void remove_lock_file_on_signal(int signo)`
	`71`	`+static void remove_lock_files_on_signal(int signo)`
`72`	`72`	`{`
`73`		`- remove_lock_file();`
	`73`	`+ remove_lock_files();`
`74`	`74`	`sigchain_pop(signo);`
`75`	`75`	`raise(signo);`
`76`	`76`	`}`
`@@ -146,8 +146,8 @@ static int lock_file(struct lock_file lk, const char path, int flags)`
`146`	`146`
`147`	`147`	`if (!lock_file_list) {`
`148`	`148`	`/* One-time initialization */`
`149`		`- sigchain_push_common(remove_lock_file_on_signal);`
`150`		`- atexit(remove_lock_file);`
	`149`	`+ sigchain_push_common(remove_lock_files_on_signal);`
	`150`	`+ atexit(remove_lock_files);`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`if (lk->active)`