From nobody Thu Feb 9 07:56:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PC8Ml3Xg7z3myJq; Thu, 9 Feb 2023 07:56:51 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PC8Ml2HSJz458T; Thu, 9 Feb 2023 07:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675929411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+rCELwPktYKs2yhaoYawgm3FxQcD14xRB3KCgv6ur6w=; b=RiOYDffe+ZReQ0XSAhxppNUiZOrY5nWsNw3Xwf5uVpNT6djiZbvw57qZs72vcc5eu/xmQw XVkqNTmsCw5gHdM1BfiMystXqodwjQmteeAlL3tg2HNSggbaLk3xuT2qjgB6Lgg4pVZ3vy PxZyRqqJY1JmSvqNKR3TrVmgz/Z34ADrubsxLVmWwLjcUHe6fW+9vnQhX9lH/j+oZlvBvS mG59dKtfvxuT7oENm9+LFdRZUkh3Z6h/FBLSDrOh0Oz5r5W9fXhUBAcgSFbqCIbh+19ycc +v/WXNjfjSleWd4iaqAZJCb5pLY3Ti/MbyLbGLlv36G+ccT+MWiKBIiMVkbDWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675929411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+rCELwPktYKs2yhaoYawgm3FxQcD14xRB3KCgv6ur6w=; b=aSXRO0YKbmmGR/lOR7NCjtbWpY1dlogvoUoljX53M35eMC6dQRzURWsmR7HZtnLJ+vX4E4 zbKP8A5eL+Qa4cnKd6mCS44anfWuFfB/wROKfogVj0by6J+EVTVuzezpM0fk1DYmwb0U8M VZbcZIhVM9uxSii6BHh4R8Zhotlpq/NalMPDPUGVrz0izi3JdaklPVWMbRa+pIb3OGXcaN LHTKRh12ug1SbdSGKZVRtCMAKXbLFDjkA8xHIqehlSk67mJKU/p4WkKUuAAgVFKaevDYcL AM5CrvkAHWOB3vKqPu4NA5KXzK9S1WbaBEajirfjtyi1hGP/OtDng9D2M/6TMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675929411; a=rsa-sha256; cv=none; b=c4m0LZ7APwv699gXwcNas4oiofyxNMakmU+jTflvXoHKAB5lvJdXU0EU0bIzk7yW7Gc1Gr ne/nRhkfhxiDuj5107DgDJcVtCa/alZLMyDtp6tQRkgxnQa51PTvGca3xiJ3++pU6qdVZ7 0oeSHfzjpgdb+fhhp8+gHAUtEhjQiBaaEjKP88ikmNS31kzS384t4BnqTfoY57+TJMOWTJ aUZa8u/KHi2ya91gVqD0Vb0DYMloPpZ4oTCP2aCspqncGEmD+NRAgN/RG83ouk6rXpK78S 8mMkmCO9n+QbD4ZK0QyquBmc4qjTew3BODEt+JDvCvMP8F5za2kkKbCshjX+1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PC8Ml1KvvzVHk; Thu, 9 Feb 2023 07:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3197upG4093076; Thu, 9 Feb 2023 07:56:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3197upTA093075; Thu, 9 Feb 2023 07:56:51 GMT (envelope-from git) Date: Thu, 9 Feb 2023 07:56:51 GMT Message-Id: <202302090756.3197upTA093075@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 1233af2a1df9 - stable/13 - linux(4): Use designated initializers. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1233af2a1df98193e0e832c7180c3177a276f6c8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=1233af2a1df98193e0e832c7180c3177a276f6c8 commit 1233af2a1df98193e0e832c7180c3177a276f6c8 Author: Dmitry Chagin AuthorDate: 2023-02-03 16:17:15 +0000 Commit: Dmitry Chagin CommitDate: 2023-02-09 07:55:24 +0000 linux(4): Use designated initializers. MFC after: 1 week (cherry picked from commit 3e0c56a717d6af3b680463b25388c7acd7cb8844) --- sys/compat/linux/linux_ipc.c | 60 +++++++++++++++++-------------------------- sys/compat/linux/linux_misc.c | 12 ++++----- 2 files changed, 30 insertions(+), 42 deletions(-) diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c index 258917e6a969..8c40d7505da5 100644 --- a/sys/compat/linux/linux_ipc.c +++ b/sys/compat/linux/linux_ipc.c @@ -546,17 +546,14 @@ linux_semtimedop(struct thread *td, struct linux_semtimedop_args *args) int linux_semget(struct thread *td, struct linux_semget_args *args) { - struct semget_args /* { - key_t key; - int nsems; - int semflg; - } */ bsd_args; + struct semget_args bsd_args = { + .key = args->key, + .nsems = args->nsems, + .semflg = args->semflg + }; if (args->nsems < 0) return (EINVAL); - bsd_args.key = args->key; - bsd_args.nsems = args->nsems; - bsd_args.semflg = args->semflg; return (sys_semget(td, &bsd_args)); } @@ -710,13 +707,11 @@ linux_msgrcv(struct thread *td, struct linux_msgrcv_args *args) int linux_msgget(struct thread *td, struct linux_msgget_args *args) { - struct msgget_args /* { - key_t key; - int msgflg; - } */ bsd_args; + struct msgget_args bsd_args = { + .key = args->key, + .msgflg = args->msgflg + }; - bsd_args.key = args->key; - bsd_args.msgflg = args->msgflg; return (sys_msgget(td, &bsd_args)); } @@ -802,41 +797,34 @@ linux_msgctl(struct thread *td, struct linux_msgctl_args *args) int linux_shmat(struct thread *td, struct linux_shmat_args *args) { - struct shmat_args /* { - int shmid; - void *shmaddr; - int shmflg; - } */ bsd_args; - - bsd_args.shmid = args->shmid; - bsd_args.shmaddr = PTRIN(args->shmaddr); - bsd_args.shmflg = args->shmflg; + struct shmat_args bsd_args = { + .shmid = args->shmid, + .shmaddr = PTRIN(args->shmaddr), + .shmflg = args->shmflg + }; + return (sys_shmat(td, &bsd_args)); } int linux_shmdt(struct thread *td, struct linux_shmdt_args *args) { - struct shmdt_args /* { - void *shmaddr; - } */ bsd_args; + struct shmdt_args bsd_args = { + .shmaddr = PTRIN(args->shmaddr) + }; - bsd_args.shmaddr = PTRIN(args->shmaddr); return (sys_shmdt(td, &bsd_args)); } int linux_shmget(struct thread *td, struct linux_shmget_args *args) { - struct shmget_args /* { - key_t key; - int size; - int shmflg; - } */ bsd_args; - - bsd_args.key = args->key; - bsd_args.size = args->size; - bsd_args.shmflg = args->shmflg; + struct shmget_args bsd_args = { + .key = args->key, + .size = args->size, + .shmflg = args->shmflg + }; + return (sys_shmget(td, &bsd_args)); } diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 036c02616de4..b6e23cafdf9f 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -1044,12 +1044,12 @@ linux_common_wait(struct thread *td, idtype_t idtype, int id, int *statusp, int linux_waitpid(struct thread *td, struct linux_waitpid_args *args) { - struct linux_wait4_args wait4_args; - - wait4_args.pid = args->pid; - wait4_args.status = args->status; - wait4_args.options = args->options; - wait4_args.rusage = NULL; + struct linux_wait4_args wait4_args = { + .pid = args->pid, + .status = args->status, + .options = args->options, + .rusage = NULL, + }; return (linux_wait4(td, &wait4_args)); }