* inet/ether_line.c (ether_line): Remove unused variable.

2007-12-17  Samuel Thibault  <samuel.thibault@ens-lyon.org>

	* login/forkpty.c (forkpty): Add const qualifier to parameters termp
	and winp.
	* login/openpty.c (openpty): Likewise.
	* login/pty.h (openpty, forkpty): Likewise.
	* manual/terminal.texi (openpty, forkpty): Likewise.

5 files changed, 22 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 4c23851981..f5e2bb9e03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-12-17  Roland McGrath  <roland@redhat.com>
+
+	* inet/ether_line.c (ether_line): Remove unused variable.
+
+2007-12-17  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* login/forkpty.c (forkpty): Add const qualifier to parameters termp
+	and winp.
+	* login/openpty.c (openpty): Likewise.
+	* login/pty.h (openpty, forkpty): Likewise.
+	* manual/terminal.texi (openpty, forkpty): Likewise.
+
 2007-12-17  Ulrich Drepper  <drepper@redhat.com>
 
 	* malloc/malloc.c (public_cALLOc): For arena other than
diff --git a/login/forkpty.c b/login/forkpty.c
index ccd5dbfe0e..482aebcb28 100644
--- a/login/forkpty.c
+++ b/login/forkpty.c
@@ -27,8 +27,8 @@ int
 forkpty (amaster, name, termp, winp)
      int *amaster;
      char *name;
-     struct termios *termp;
-     struct winsize *winp;
+     const struct termios *termp;
+     const struct winsize *winp;
 {
   int master, slave, pid;
 
diff --git a/login/openpty.c b/login/openpty.c
index fe11d49feb..0ff901c3f5 100644
--- a/login/openpty.c
+++ b/login/openpty.c
@@ -84,8 +84,8 @@ pts_name (int fd, char **pts, size_t buf_len)
    according to TERMP and WINP.  Return handles for both ends in
    AMASTER and ASLAVE, and return the name of the slave end in NAME.  */
 int
-openpty (int *amaster, int *aslave, char *name, struct termios *termp,
-	 struct winsize *winp)
+openpty (int *amaster, int *aslave, char *name,
+	 const struct termios *termp, const struct winsize *winp)
 {
 #ifdef PATH_MAX
   char _buf[PATH_MAX];
diff --git a/login/pty.h b/login/pty.h
index 2d4b5e270f..a2ed77d58d 100644
--- a/login/pty.h
+++ b/login/pty.h
@@ -32,12 +32,14 @@ __BEGIN_DECLS
    attributes according to TERMP and WINP and return handles for both
    ends in AMASTER and ASLAVE.  */
 extern int openpty (int *__amaster, int *__aslave, char *__name,
-		    struct termios *__termp, struct winsize *__winp) __THROW;
+		    const struct termios *__termp,
+		    const struct winsize *__winp) __THROW;
 
 /* Create child process and establish the slave pseudo terminal as the
    child's controlling terminal.  */
 extern int forkpty (int *__amaster, char *__name,
-		    struct termios *__termp, struct winsize *__winp) __THROW;
+		    const struct termios *__termp,
+		    const struct winsize *__winp) __THROW;
 
 __END_DECLS
 
diff --git a/manual/terminal.texi b/manual/terminal.texi
index 96edcf0513..ee4df4ef7e 100644
--- a/manual/terminal.texi
+++ b/manual/terminal.texi
@@ -2075,7 +2075,7 @@ These functions, derived from BSD, are available in the separate
 
 @comment pty.h
 @comment BSD
-@deftypefun int openpty (int *@var{amaster}, int *@var{aslave}, char *@var{name}, struct termios *@var{termp}, struct winsize *@var{winp})
+@deftypefun int openpty (int *@var{amaster}, int *@var{aslave}, char *@var{name}, const struct termios *@var{termp}, const struct winsize *@var{winp})
 This function allocates and opens a pseudo-terminal pair, returning the
 file descriptor for the master in @var{*amaster}, and the file
 descriptor for the slave in @var{*aslave}.  If the argument @var{name}
@@ -2106,7 +2106,7 @@ device instead.
 
 @comment pty.h
 @comment BSD
-@deftypefun int forkpty (int *@var{amaster}, char *@var{name}, struct termios *@var{termp}, struct winsize *@var{winp})
+@deftypefun int forkpty (int *@var{amaster}, char *@var{name}, const struct termios *@var{termp}, const struct winsize *@var{winp})
 This function is similar to the @code{openpty} function, but in
 addition, forks a new process (@pxref{Creating a Process}) and makes the
 newly opened slave pseudo-terminal device the controlling terminal