From nobody Fri Jun 17 19:40:26 2022 X-Original-To: dev-commits-src-branches@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 9676685CEDB; Fri, 17 Jun 2022 19:40:28 +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 4LPqBz3BWvz3hWM; Fri, 17 Jun 2022 19:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494828; 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=ZDfp9pIXMBabdYzW0QCjuI9HHGOCvXZmOLxTrAEKAM4=; b=N26TZvGWMzcZEtoNVMAjQcYJY+VZxS/ZxW88th9KgH0b9QEpDo1A7KJFwqoImXkP1uGbnJ vKKWj4UsPUvhHY5aEfb7E/AgbC4RICGg/JJPj2xLxefU5PNsD4oAwnmczIIr5rFf/521z8 pRcX+EOH5KIiBddi974+/Eq/lMuIOJmGOOE8zcOgbBa82DVPbPFVkikM7Vyn/7+mb8oiK3 8pn8Dqri70oDpLVZcr8Yfo0Yby6WadG/Tmdm/PKHY1tFf9+BWW12JCEUQRoE/XR2DTt7Eh fDKdix520x/ooZfjw/l1N0DgiyW+6xuaFZKZeOU5A9ETZB5zMhSOEgWGY53mqw== 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 C5F3A25AE9; Fri, 17 Jun 2022 19:40:26 +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 25HJeQnD025813; Fri, 17 Jun 2022 19:40:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJeQZA025812; Fri, 17 Jun 2022 19:40:26 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:40:26 GMT Message-Id: <202206171940.25HJeQZA025812@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: 89daba2ff403 - stable/13 - sysvsem: Trim traiing whitespace List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 89daba2ff4034341718082d93ff7cb670340401a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494828; 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=ZDfp9pIXMBabdYzW0QCjuI9HHGOCvXZmOLxTrAEKAM4=; b=IkhM6qEJSbCISHdHOjr+dtU4nZcusP/cRFjCJkOsuno7Yc1UpD4aiILohxnE644/tCfhtj tcykoLGnsmkwjRDnqoje2whkyK/3/vv73zp4x14q+3vGrSVqfFE1LSo+rV61F/B7mwjYz0 Ra4r+H2wJKVyfDm3frUgQhKBBy/21bJrQjQSgeZQ0mqtyK4SUaltD5CY/1baCjwwVVWVgL XCXrn54M6iomCBqeI0sJkZgyW6PUw5/cTn77EH92U4sNDuGUhrgYLDhUodFfUSaoOAtlEO NvoHsfvRwOLZCnqY1R6jIBM9EXi6JOyT+mqfbyz55FfZY5GrT+YSFoxPQ9B+wA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494828; a=rsa-sha256; cv=none; b=BUueaaxau0KtUR4s3u5KryjYSxpkwpE4DMfXVJnfQfK2NrrEWj0P4K8/4inJWiNrIbKd7L x7/d6ut5YGbfb7gtn/UnV7bEvc8Uu3wUUYcsPDmbiE/+z+yNcVtfZN/DcV8wa6IbYOp5j2 Vx5Q42vXVoQ8yqfjdz4+3TvnygwKlAhm0pu+x/0+z4B6aD9KYa63RMTfJ4ChG5ihHGKmcO uh18ETwXOQU2m5lsVfiZx3ofjQrlbcpMoaDn1HSOBFOQnTs6Q3O0C4wbNhtgkiQDn+IpL1 zIb5+rvnx1dQBu0y4Y8ysMIEF9FlCrxW6kq67d1dfal0NKmPosbMBsnmW2E+TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=89daba2ff4034341718082d93ff7cb670340401a commit 89daba2ff4034341718082d93ff7cb670340401a Author: Dmitry Chagin AuthorDate: 2022-05-14 11:06:40 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:17 +0000 sysvsem: Trim traiing whitespace MFC after: 2 weeks (cherry picked from commit f0b0fdf15efee38ee6989ec2b1668f065704c7df) --- sys/kern/sysv_sem.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c index 14487cd16282..fda4d263535d 100644 --- a/sys/kern/sysv_sem.c +++ b/sys/kern/sysv_sem.c @@ -669,7 +669,7 @@ sys___semctl(struct thread *td, struct __semctl_args *uap) break; case SETVAL: semun.val = arg.val; - break; + break; } error = kern_semctl(td, uap->semid, uap->semnum, uap->cmd, &semun, @@ -851,7 +851,7 @@ kern_semctl(struct thread *td, int semid, int semnum, int cmd, * won't work for SETALL since we can't copyin() more * data than the user specified as we may return a * spurious EFAULT. - * + * * Note that the number of semaphores in a set is * fixed for the life of that set. The only way that * the 'count' could change while are blocked in @@ -864,7 +864,7 @@ kern_semctl(struct thread *td, int semid, int semnum, int cmd, * */ count = semakptr->u.sem_nsems; - mtx_unlock(sema_mtxp); + mtx_unlock(sema_mtxp); array = malloc(sizeof(*array) * count, M_TEMP, M_WAITOK); mtx_lock(sema_mtxp); if ((error = semvalid(semid, rpr, semakptr)) != 0) @@ -917,7 +917,7 @@ kern_semctl(struct thread *td, int semid, int semnum, int cmd, * and why we require a userland buffer. */ count = semakptr->u.sem_nsems; - mtx_unlock(sema_mtxp); + mtx_unlock(sema_mtxp); array = malloc(sizeof(*array) * count, M_TEMP, M_WAITOK); error = copyin(arg->array, array, count * sizeof(*array)); mtx_lock(sema_mtxp); @@ -1838,7 +1838,7 @@ freebsd7___semctl(struct thread *td, struct freebsd7___semctl_args *uap) break; case SETVAL: semun.val = arg.val; - break; + break; } error = kern_semctl(td, uap->semid, uap->semnum, uap->cmd, &semun, @@ -1909,7 +1909,7 @@ freebsd7_freebsd32_semctl(struct thread *td, case SETALL: error = copyin(uap->arg, &arg, sizeof(arg)); if (error) - return (error); + return (error); break; } @@ -1981,7 +1981,7 @@ freebsd32_semctl(struct thread *td, struct freebsd32_semctl_args *uap) case SETALL: error = copyin(uap->arg, &arg, sizeof(arg)); if (error) - return (error); + return (error); break; } @@ -2007,7 +2007,7 @@ freebsd32_semctl(struct thread *td, struct freebsd32_semctl_args *uap) break; case SETVAL: semun.val = arg.val; - break; + break; } error = kern_semctl(td, uap->semid, uap->semnum, uap->cmd, &semun,