diff options
| author | Paul Eggert <[email protected]> | 2011-03-14 18:19:50 -0700 |
|---|---|---|
| committer | Paul Eggert <[email protected]> | 2011-03-14 18:19:50 -0700 |
| commit | b3dd38aba98f3521d164ef698d6b77b80d867fb8 (patch) | |
| tree | 2dd84c2ae762bc0990dbea23d2fd8f7c2ee0ae93 /src/filelock.c | |
| parent | 03d78a21befef9074bd85bba98968e9c25e022af (diff) | |
* filelock.c (lock_file_1): Rename local to avoid shadowing.
Diffstat (limited to 'src/filelock.c')
| -rw-r--r-- | src/filelock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/filelock.c b/src/filelock.c index 0e4cee3c84..2138eaa502 100644 --- a/src/filelock.c +++ b/src/filelock.c @@ -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 ()); |