From owner-p4-projects@FreeBSD.ORG Sat Sep 9 19:00:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F12216A4D2; Sat, 9 Sep 2006 19:00:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2300F16A4A7 for ; Sat, 9 Sep 2006 19:00:39 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F82D43D5A for ; Sat, 9 Sep 2006 19:00:15 +0000 (GMT) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k89J0FP0090413 for ; Sat, 9 Sep 2006 19:00:15 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k89J0FVr090410 for perforce@freebsd.org; Sat, 9 Sep 2006 19:00:15 GMT (envelope-from netchild@freebsd.org) Date: Sat, 9 Sep 2006 19:00:15 GMT Message-Id: <200609091900.k89J0FVr090410@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 105908 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Sep 2006 19:00:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=105908 Change 105908 by netchild@netchild_magellan on 2006/09/09 19:00:08 Style Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#4 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#4 (text+ko) ==== @@ -1205,25 +1205,25 @@ } if (name == -1) { log(LOG_WARNING, "LINUX: 'getsockopt' level=0x%04x" - "optname=0x%04x not implemented\n", - linux_args.level, linux_args.optname); + "optname=0x%04x not implemented\n", + linux_args.level, linux_args.optname); return (EINVAL); }; bsd_args.name = name; if (bsd_args.level == SOL_SOCKET && name == LOCAL_PEERCRED) { if ((error = copyin(PTRIN(linux_args.optval), - &linux_ucred, sizeof(linux_ucred)))) + &linux_ucred, sizeof(linux_ucred)))) return (error); if ((error = copyin(PTRIN(linux_args.optlen), - &optlen, sizeof(optlen)))) + &optlen, sizeof(optlen)))) return (error); if (optlen < sizeof(linux_ucred)) return (EFAULT); xuclen = sizeof(xuc); if ((rc = error = kern_getsockopt(td, bsd_args.s, - 0, bsd_args.name, - (caddr_t) &xuc, UIO_SYSSPACE, &xuclen))) + 0, bsd_args.name, + (caddr_t) &xuc, UIO_SYSSPACE, &xuclen))) return (error); if (xuc.cr_version != XUCRED_VERSION) return (EINVAL); @@ -1232,7 +1232,7 @@ linux_ucred.uid = xuc.cr_uid; linux_ucred.gid = xuc.cr_gid; if ((error = copyout(&linux_ucred, - PTRIN(linux_args.optval), sizeof(linux_ucred)))) + PTRIN(linux_args.optval), sizeof(linux_ucred)))) return (error); return (rc); } else {