From owner-svn-src-head@freebsd.org Wed Oct 28 14:16:08 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DDD9B447FC7; Wed, 28 Oct 2020 14:16:08 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CLrGJ5TgGz49t7; Wed, 28 Oct 2020 14:16:08 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A0B331D997; Wed, 28 Oct 2020 14:16:08 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09SEG8ud083696; Wed, 28 Oct 2020 14:16:08 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09SEG8o4083695; Wed, 28 Oct 2020 14:16:08 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <202010281416.09SEG8o4083695@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Wed, 28 Oct 2020 14:16:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367106 - head/sys/compat/linux X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/sys/compat/linux X-SVN-Commit-Revision: 367106 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 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: Wed, 28 Oct 2020 14:16:08 -0000 Author: trasz Date: Wed Oct 28 14:16:08 2020 New Revision: 367106 URL: https://svnweb.freebsd.org/changeset/base/367106 Log: Make linux_errtbl a bit more readable by using named initializers. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D26970 Modified: head/sys/compat/linux/linux_errno.inc Modified: head/sys/compat/linux/linux_errno.inc ============================================================================== --- head/sys/compat/linux/linux_errno.inc Wed Oct 28 13:46:11 2020 (r367105) +++ head/sys/compat/linux/linux_errno.inc Wed Oct 28 14:16:08 2020 (r367106) @@ -36,113 +36,123 @@ * include/uapi/asm-generic/errno.h */ const int linux_errtbl[ELAST + 1] = { - -0, - -1, - -2, - -3, - -4, - -5, - -6, - -7, - -8, - -9, + /* [0, 9] */ + [0] = -0, + [EPERM] = -1, + [ENOENT] = -2, + [ESRCH] = -3, + [EINTR] = -4, + [EIO] = -5, + [ENXIO] = -6, + [E2BIG] = -7, + [ENOEXEC] = -8, + [EBADF] = -9, - -10, - -35, /* EDEADLK */ - -12, - -13, - -14, - -15, - -16, - -17, - -18, - -19, + /* [10, 19] */ + [ECHILD] = -10, + [EDEADLK] = -35, + [ENOMEM] = -12, + [EACCES] = -13, + [EFAULT] = -14, + [ENOTBLK] = -15, + [EBUSY] = -16, + [EEXIST] = -17, + [EXDEV] = -18, + [ENODEV] = -19, - -20, - -21, - -22, - -23, - -24, - -25, - -26, - -27, - -28, - -29, + /* [20, 29] */ + [ENOTDIR] = -20, + [EISDIR] = -21, + [EINVAL] = -22, + [ENFILE] = -23, + [EMFILE] = -24, + [ENOTTY] = -25, + [ETXTBSY] = -26, + [EFBIG] = -27, + [ENOSPC] = -28, + [ESPIPE] = -29, - -30, - -31, - -32, - -33, - -34, - -11, /* EAGAIN */ - -115, - -114, - -88, - -89, + /* [30, 39] */ + [EROFS] = -30, + [EMLINK] = -31, + [EPIPE] = -32, + [EDOM] = -33, + [ERANGE] = -34, + [EAGAIN] = -11, + [EINPROGRESS] = -115, + [EALREADY] = -114, + [ENOTSOCK] = -88, + [EDESTADDRREQ] = -89, - -90, - -91, - -92, - -93, - -94, - -95, - -96, - -97, - -98, - -99, + /* [40, 49] */ + [EMSGSIZE] = -90, + [EPROTOTYPE] = -91, + [ENOPROTOOPT] = -92, + [EPROTONOSUPPORT] = -93, + [ESOCKTNOSUPPORT] = -94, + [EOPNOTSUPP] = -95, + [EPFNOSUPPORT] = -96, + [EAFNOSUPPORT] = -97, + [EADDRINUSE] = -98, + [EADDRNOTAVAIL] = -99, - -100, - -101, - -102, - -103, - -104, - -105, - -106, - -107, - -108, - -109, + /* [50, 59] */ + [ENETDOWN] = -100, + [ENETUNREACH] = -101, + [ENETRESET] = -102, + [ECONNABORTED] = -103, + [ECONNRESET] = -104, + [ENOBUFS] = -105, + [EISCONN] = -106, + [ENOTCONN] = -107, + [ESHUTDOWN] = -108, + [ETOOMANYREFS] = -109, - -110, - -111, - -40, - -36, - -112, - -113, - -39, - -11, - -87, - -122, + /* [60, 69] */ + [ETIMEDOUT] = -110, + [ECONNREFUSED] = -111, + [ELOOP] = -40, + [ENAMETOOLONG] = -36, + [EHOSTDOWN] = -112, + [EHOSTUNREACH] = -113, + [ENOTEMPTY] = -39, + [EPROCLIM] = -11, + [EUSERS] = -87, + [EDQUOT] = -122, - -116, - -66, - -6, /* EBADRPC -> ENXIO */ - -6, /* ERPCMISMATCH -> ENXIO */ - -6, /* EPROGUNAVAIL -> ENXIO */ - -6, /* EPROGMISMATCH -> ENXIO */ - -6, /* EPROCUNAVAIL -> ENXIO */ - -37, - -38, - -9, + /* [70, 79] */ + [ESTALE] = -116, + [EREMOTE] = -66, + [EBADRPC] = -6, /* EBADRPC -> ENXIO */ + [ERPCMISMATCH] = -6, /* ERPCMISMATCH -> ENXIO */ + [EPROGUNAVAIL] = -6, /* EPROGUNAVAIL -> ENXIO */ + [EPROGMISMATCH] = -6, /* EPROGMISMATCH -> ENXIO */ + [EPROCUNAVAIL] = -6, /* EPROCUNAVAIL -> ENXIO */ + [ENOLCK] = -37, + [ENOSYS] = -38, + [EFTYPE] = -9, - -6, /* EAUTH -> ENXIO */ - -6, /* ENEEDAUTH -> ENXIO */ - -43, - -42, - -75, - -125, - -84, - -61, - -22, /* EDOOFUS -> EINVAL */ - -74, + /* [80, 89] */ + [EAUTH] = -6, /* EAUTH -> ENXIO */ + [ENEEDAUTH] = -6, /* ENEEDAUTH -> ENXIO */ + [EIDRM] = -43, + [ENOMSG] = -42, + [EOVERFLOW] = -75, + [ECANCELED] = -125, + [EILSEQ] = -84, + [ENOATTR] = -61, + [EDOOFUS] = -22, /* EDOOFUS -> EINVAL */ + [EBADMSG] = -74, - -72, - -67, - -71, - -1, /* ENOTCAPABLE -> EPERM */ - -1, /* ECAPMODE -> EPERM */ - -131, /* ENOTRECOVERABLE */ - -130, /* EOWNERDEAD */ - -22, /* EINTEGRITY -> EINVAL */ + /* [90, 99] */ + [EMULTIHOP] = -72, + [ENOLINK] = -67, + [EPROTO] = -71, + [ENOTCAPABLE] = -1, /* ENOTCAPABLE -> EPERM */ + [ECAPMODE] = -1, /* ECAPMODE -> EPERM */ + [ENOTRECOVERABLE] = -131, /* ENOTRECOVERABLE */ + [EOWNERDEAD] = -130, /* EOWNERDEAD */ + [EINTEGRITY] = -22, /* EINTEGRITY -> EINVAL */ }; _Static_assert(ELAST == 97,