[ Alan as tty maintainer added to Cc ]
On Fri, May 02, 2008 at 02:59:46PM +0800, WANG Cong wrote:
>
> 'put_char' of 'struct tty_operations' has changed from 'void' into 'int'.
> This can also shut up comipler warnings.
Not only, this could also be a runtime error.
> Cc: Jeff Dike <[EMAIL PROTECTED]>
> Signed-off-by: WANG Cong <[EMAIL PROTECTED]>
>
> ---
>
> diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
> index 10b86e1..5047490 100644
> --- a/arch/um/drivers/line.c
> +++ b/arch/um/drivers/line.c
> @@ -191,9 +191,9 @@ void line_flush_chars(struct tty_struct *tty)
> line_flush_buffer(tty);
> }
>
> -void line_put_char(struct tty_struct *tty, unsigned char ch)
> +int line_put_char(struct tty_struct *tty, unsigned char ch)
> {
> - line_write(tty, &ch, sizeof(ch));
> + return line_write(tty, &ch, sizeof(ch));
> }
>
> int line_write(struct tty_struct *tty, const unsigned char *buf, int len)
> diff --git a/arch/um/include/line.h b/arch/um/include/line.h
> index 1223f2c..979b73e 100644
> --- a/arch/um/include/line.h
> +++ b/arch/um/include/line.h
> @@ -71,7 +71,7 @@ extern int line_setup(struct line *lines, unsigned int
> sizeof_lines,
> char *init, char **error_out);
> extern int line_write(struct tty_struct *tty, const unsigned char *buf,
> int len);
> -extern void line_put_char(struct tty_struct *tty, unsigned char ch);
> +extern int line_put_char(struct tty_struct *tty, unsigned char ch);
> extern void line_set_termios(struct tty_struct *tty, struct ktermios * old);
> extern int line_chars_in_buffer(struct tty_struct *tty);
> extern void line_flush_buffer(struct tty_struct *tty);
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
