From owner-svn-src-head@FreeBSD.ORG Sun Mar 1 09:50:13 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E1BC5106566B; Sun, 1 Mar 2009 09:50:13 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B63078FC0C; Sun, 1 Mar 2009 09:50:13 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n219oD9f037777; Sun, 1 Mar 2009 09:50:13 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n219oDtL037775; Sun, 1 Mar 2009 09:50:13 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <200903010950.n219oDtL037775@svn.freebsd.org> From: Ed Schouten Date: Sun, 1 Mar 2009 09:50:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189222 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Mar 2009 09:50:14 -0000 Author: ed Date: Sun Mar 1 09:50:13 2009 New Revision: 189222 URL: http://svn.freebsd.org/changeset/base/189222 Log: Improve my previous changes to the TTY code: also remove memcpy(). It's better to just use internal language constructs, because it is likely the compiler has a better opinion on whether to perform inlining, which is very likely to happen to struct winsize. Submitted by: Christoph Mallon Modified: head/sys/kern/tty.c head/sys/kern/tty_pts.c Modified: head/sys/kern/tty.c ============================================================================== --- head/sys/kern/tty.c Sun Mar 1 09:35:41 2009 (r189221) +++ head/sys/kern/tty.c Sun Mar 1 09:50:13 2009 (r189222) @@ -724,14 +724,14 @@ ttyil_ioctl(struct cdev *dev, u_long cmd switch (cmd) { case TIOCGETA: /* Obtain terminal flags through tcgetattr(). */ - memcpy(data, dev->si_drv2, sizeof(struct termios)); + *(struct termios*)data = *(struct termios*)dev->si_drv2; break; case TIOCSETA: /* Set terminal flags through tcsetattr(). */ error = priv_check(td, PRIV_TTY_SETA); if (error) break; - memcpy(dev->si_drv2, data, sizeof(struct termios)); + *(struct termios*)dev->si_drv2 = *(struct termios*)data; break; case TIOCGETD: *(int *)data = TTYDISC; @@ -1344,7 +1344,7 @@ tty_generic_ioctl(struct tty *tp, u_long return (0); case TIOCGETA: /* Obtain terminal flags through tcgetattr(). */ - memcpy(data, &tp->t_termios, sizeof(struct termios)); + *(struct termios*)data = tp->t_termios; return (0); case TIOCSETA: case TIOCSETAW: @@ -1568,13 +1568,13 @@ tty_generic_ioctl(struct tty *tp, u_long return (0); case TIOCGWINSZ: /* Obtain window size. */ - memcpy(data, &tp->t_winsize, sizeof(struct winsize)); + *(struct winsize*)data = tp->t_winsize; return (0); case TIOCSWINSZ: /* Set window size. */ if (bcmp(&tp->t_winsize, data, sizeof(struct winsize)) == 0) return (0); - memcpy(&tp->t_winsize, data, sizeof(struct winsize)); + tp->t_winsize = *(struct winsize*)data; tty_signal_pgrp(tp, SIGWINCH); return (0); case TIOCEXCL: Modified: head/sys/kern/tty_pts.c ============================================================================== --- head/sys/kern/tty_pts.c Sun Mar 1 09:35:41 2009 (r189221) +++ head/sys/kern/tty_pts.c Sun Mar 1 09:50:13 2009 (r189222) @@ -310,7 +310,7 @@ ptsdev_ioctl(struct file *fp, u_long cmd case TIOCGETA: /* Obtain terminal flags through tcgetattr(). */ tty_lock(tp); - memcpy(data, &tp->t_termios, sizeof(struct termios)); + *(struct termios*)data = tp->t_termios; tty_unlock(tp); return (0); #endif /* PTS_LINUX */