(server_accept_connection): Simplify naming.

(emacs_get_tty_pgrp): Use SDATA.

diff --git a/src/ChangeLog b/src/ChangeLog
index e38d0935031b26f181a151eaac0df2d05a7cfec2..f261a08b07b1e0f3282346e6744f319e1d64b379 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2008-03-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * process.c (server_accept_connection): Simplify naming.
+       (emacs_get_tty_pgrp): Use SDATA.
+
        * coding.c (decode_coding_object): Fix last change.
 
 2008-03-27  Jason Rumney  <jasonr@gnu.org>

diff --git a/src/process.c b/src/process.c
index 9c7e542c3bea736ed224fbdbaf39fe8c519d235c..c3dfd59eeb559bfc9966b4dc354557225f1dcf9d 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -4055,7 +4055,7 @@ server_accept_connection (server, channel)
 #endif
     default:
       caller = Fnumber_to_string (make_number (connect_counter));
-      caller = concat3 (build_string (" <*"), caller, build_string ("*>"));
+      caller = concat3 (build_string (" <"), caller, build_string (">"));
       break;
     }
 
@@ -5709,7 +5709,7 @@ emacs_get_tty_pgrp (p)
       int fd;
       /* Some OS:es (Solaris 8/9) does not allow TIOCGPGRP from the
         master side.  Try the slave side.  */
-      fd = emacs_open (XSTRING (p->tty_name)->data, O_RDONLY, 0);
+      fd = emacs_open (SDATA (p->tty_name), O_RDONLY, 0);
 
       if (fd != -1)
        {
@@ -5892,7 +5892,7 @@ process_send_signal (process, signo, current_group, nomsg)
         you'd better be using one of the alternatives above!  */
 #endif /* ! defined (TCGETA) */
 #endif /* ! defined (TIOCGLTC) && defined (TIOCGETC) */
-       /* In this case, the code above should alway returns.  */
+       /* In this case, the code above should alway return.  */
        abort ();
 #endif /* ! defined HAVE_TERMIOS */