Commit b3dd38ab authored by Paul Eggert's avatar Paul Eggert
Browse files

* filelock.c (lock_file_1): Rename local to avoid shadowing.

parent 03d78a21
2011-03-15 Paul Eggert <eggert@cs.ucla.edu>
 
* filelock.c (within_one_second): Now static.
(lock_file_1): Rename local to avoid shadowing.
 
* buffer.c (fix_overlays_before): Mark locals as initialized.
(fix_start_end_in_overlays): Likewise. This function should be
......@@ -344,13 +344,13 @@ static int
lock_file_1 (char *lfname, int force)
{
register int err;
time_t boot_time;
time_t boot;
const char *user_name;
const char *host_name;
char *lock_info_str;
/* Call this first because it can GC. */
boot_time = get_boot_time ();
boot = get_boot_time ();
if (STRINGP (Fuser_login_name (Qnil)))
user_name = SSDATA (Fuser_login_name (Qnil));
......@@ -363,9 +363,9 @@ lock_file_1 (char *lfname, int force)
lock_info_str = (char *)alloca (strlen (user_name) + strlen (host_name)
+ LOCK_PID_MAX + 30);
if (boot_time)
if (boot)
sprintf (lock_info_str, "%s@%s.%lu:%lu", user_name, host_name,
(unsigned long) getpid (), (unsigned long) boot_time);
(unsigned long) getpid (), (unsigned long) boot);
else
sprintf (lock_info_str, "%s@%s.%lu", user_name, host_name,
(unsigned long) getpid ());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment