[Emacs-diffs] Changes to emacs/src/filelock.c

[Andreas Schwab]

Index: emacs/src/filelock.c
diff -c emacs/src/filelock.c:1.99 emacs/src/filelock.c:1.100
*** emacs/src/filelock.c:1.99   Mon Sep  1 15:45:52 2003
--- emacs/src/filelock.c        Sat Nov 27 22:09:40 2004
***************
*** 377,382 ****
--- 377,385 ----
    char *host_name;
    char *lock_info_str;
  
+   /* Call this first because it can GC.  */
+   boot_time = get_boot_time ();
+ 
    if (STRINGP (Fuser_login_name (Qnil)))
      user_name = (char *)SDATA (Fuser_login_name (Qnil));
    else
***************
*** 386,394 ****
    else
      host_name = "";
    lock_info_str = (char *)alloca (strlen (user_name) + strlen (host_name)
!                                 + LOCK_PID_MAX + 5);
  
-   boot_time = get_boot_time ();
    if (boot_time)
      sprintf (lock_info_str, "address@hidden:%lu", user_name, host_name,
             (unsigned long) getpid (), (unsigned long) boot_time);
--- 389,396 ----
    else
      host_name = "";
    lock_info_str = (char *)alloca (strlen (user_name) + strlen (host_name)
!                                 + LOCK_PID_MAX + 30);
  
    if (boot_time)
      sprintf (lock_info_str, "address@hidden:%lu", user_name, host_name,
             (unsigned long) getpid (), (unsigned long) boot_time);