From nobody Thu Jan 04 13:48:08 2024 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 4T5SbF07D0z56R2p; Thu, 4 Jan 2024 13:48:09 +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 4T5SbD5V2Wz466y; Thu, 4 Jan 2024 13:48:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704376088; 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=DCW3rNOsQ1tZbjOsKGUyk42y+xszjLIOSEgxLiUP+80=; b=ucOzfUgW6P0yHjUeLQ9LmohhxbH+86KQ1WW6Y6GJKQiSIjcubTyt/D6abzhF03SQyLFM/Q yyih2AYl8qbOm8qbYmKEQlUKBv2ADHKo/rZsn7Lk5OPZfubxxCX60vkAFcwIyMUuSvp7Ll 4ao42x6aIB0uxKsy9nuI/4pFfFV8zEy7g5P7gQ5xhAzO7symSQfuUatqFY/RNhFedZEgtk /C+nLA4P7HIa4zxzRmrkmNFO3jYPH/j97SfjC6jgi/TnBhS4emN+8SN+Q+8uc8IBJsTiAr KP4BLKtn347LMRw545wFVGeYU4lUyfswAixWT5uI96Cv3JckGL9hWIL8GfWl3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704376088; 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=DCW3rNOsQ1tZbjOsKGUyk42y+xszjLIOSEgxLiUP+80=; b=jHc5jX5bU2CWUGgaxoOPpPoJEo3b4Y06sTPt3qJwPr2jAIHn2vOqpnxYOGQFbCEDICmiII xW+MP5lhr4pUu5JhhtSoAAuNpJtG+vSIN8RXBzvxPOIIm5KrFIZQHpQUOBubHdMTKYxbzF OTzHIIUiFYkBJ41SE9P0rTiGpPvk5Fnaa/L16G2l3Bv9NQSTtDZo88Pt91SHTaWIQ0qlIz JeN6Sr/99rhniljREqMGXVcIavaiBhshgIilonndw0cqirDBsSFgt3e4IeMefIVGngIj7w 6Juqy2VRqGCUCa1Z5bluM6KCM/3iwi3MjXN5HLd+WRpEnN0mWP5oebRW6vcXZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704376088; a=rsa-sha256; cv=none; b=Pm2xJ6IoWOKnJ9g9CFOcsluRVkmte/UKd2L0sjYdSPuNFexeI1iYyVaN/zt8ndNe8zm6L3 roWRm8fY5Jqpd5q2vxn4g6GmoAEwwIpjZtkp78tP4sPyiJ2iSE+jkmSHEXhTRbowCendgf WSVZdiruhlToAzZczlp5kvK70Z9gVd1pPSy3r7K9ePDoAOaqodpz4FLoXePB1ZSRvd62yc pxUWa5UmriTVS+dhzXZ7HExGNMR08T6SSeFsVekOCn9hPRU4vftatYszTvQx47WpAOzbOV RCvEahYOwoRoMlWwsjSYZ7Ed16bw8YZyU/JhTbiyA5p60FJGVYPc9vh3mprWyg== 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 4T5SbD4b4hzGK7; Thu, 4 Jan 2024 13:48:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 404Dm8MH049979; Thu, 4 Jan 2024 13:48:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 404Dm8mU049976; Thu, 4 Jan 2024 13:48:08 GMT (envelope-from git) Date: Thu, 4 Jan 2024 13:48:08 GMT Message-Id: <202401041348.404Dm8mU049976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 55205beabb0f - stable/14 - sa: Make sa_param_table[] const and static 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 55205beabb0fb5dbd7c73e5632f70a6eeacd2909 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=55205beabb0fb5dbd7c73e5632f70a6eeacd2909 commit 55205beabb0fb5dbd7c73e5632f70a6eeacd2909 Author: Mark Johnston AuthorDate: 2023-12-27 21:40:12 +0000 Commit: Mark Johnston CommitDate: 2024-01-04 13:42:35 +0000 sa: Make sa_param_table[] const and static No functional change intended. Reviewed by: ken, imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43204 (cherry picked from commit 46a6cfee1bb61145717166a3bbbd8dbad27fbf36) --- sys/cam/scsi/scsi_sa.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c index 07b917daa0c0..aaf79b74a509 100644 --- a/sys/cam/scsi/scsi_sa.c +++ b/sys/cam/scsi/scsi_sa.c @@ -633,7 +633,7 @@ static struct sa_prot_map *safindprotent(char *name, struct sa_prot_map *table, int table_ents); static int sasetprotents(struct cam_periph *periph, struct mtparamset *ps, int num_params); -static struct sa_param_ent *safindparament(struct mtparamset *ps); +static const struct sa_param_ent *safindparament(struct mtparamset *ps); static int saparamsetlist(struct cam_periph *periph, struct mtsetlist *list, int need_copy); static int saextget(struct cdev *dev, struct cam_periph *periph, @@ -1356,7 +1356,7 @@ typedef enum { SA_PARAM_TYPE_NODE } sa_param_type; -struct sa_param_ent { +static const struct sa_param_ent { char *name; sa_param_type param_type; int (*set_func)(struct cam_periph *periph, struct mtparamset *ps, @@ -1367,7 +1367,7 @@ struct sa_param_ent { {"protection.", SA_PARAM_TYPE_NODE, sasetprotents } }; -static struct sa_param_ent * +static const struct sa_param_ent * safindparament(struct mtparamset *ps) { unsigned int i; @@ -1403,7 +1403,7 @@ saparamsetlist(struct cam_periph *periph, struct mtsetlist *list, int i, contig_ents; int error; struct mtparamset *params, *first; - struct sa_param_ent *first_ent; + const struct sa_param_ent *first_ent; error = 0; params = NULL; @@ -1444,7 +1444,7 @@ saparamsetlist(struct cam_periph *periph, struct mtsetlist *list, first = NULL; first_ent = NULL; for (i = 0; i < list->num_params; i++) { - struct sa_param_ent *ent; + const struct sa_param_ent *ent; ent = safindparament(¶ms[i]); if (ent == NULL) {