Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 1 Aug 2025 14:58:40 GMT
From:      Brooks Davis <brooks@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: bfebc6deb4b9 - main - sysent: regen for const __sysctl argument
Message-ID:  <202508011458.571Eweot015270@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/src/commit/?id=bfebc6deb4b92f86fcd9797e658ad697cd0ad6c5

commit bfebc6deb4b92f86fcd9797e658ad697cd0ad6c5
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2025-08-01 14:15:43 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2025-08-01 14:54:12 +0000

    sysent: regen for const __sysctl argument
---
 lib/libsys/_libsys.h                           | 4 ++--
 sys/compat/freebsd32/freebsd32_proto.h         | 2 +-
 sys/compat/freebsd32/freebsd32_systrace_args.c | 4 ++--
 sys/kern/systrace_args.c                       | 4 ++--
 sys/sys/sysproto.h                             | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/libsys/_libsys.h b/lib/libsys/_libsys.h
index 1799906eb885..7a1685cca2d1 100644
--- a/lib/libsys/_libsys.h
+++ b/lib/libsys/_libsys.h
@@ -180,7 +180,7 @@ typedef int (__sys_pathconf_t)(const char *, int);
 typedef int (__sys_fpathconf_t)(int, int);
 typedef int (__sys_getrlimit_t)(u_int, struct rlimit *);
 typedef int (__sys_setrlimit_t)(u_int, struct rlimit *);
-typedef int (__sys___sysctl_t)(int *, u_int, void *, size_t *, const void *, size_t);
+typedef int (__sys___sysctl_t)(const int *, u_int, void *, size_t *, const void *, size_t);
 typedef int (__sys_mlock_t)(const void *, size_t);
 typedef int (__sys_munlock_t)(const void *, size_t);
 typedef int (__sys_undelete_t)(const char *);
@@ -584,7 +584,7 @@ int __sys_pathconf(const char * path, int name);
 int __sys_fpathconf(int fd, int name);
 int __sys_getrlimit(u_int which, struct rlimit * rlp);
 int __sys_setrlimit(u_int which, struct rlimit * rlp);
-int __sys___sysctl(int * name, u_int namelen, void * old, size_t * oldlenp, const void * new, size_t newlen);
+int __sys___sysctl(const int * name, u_int namelen, void * old, size_t * oldlenp, const void * new, size_t newlen);
 int __sys_mlock(const void * addr, size_t len);
 int __sys_munlock(const void * addr, size_t len);
 int __sys_undelete(const char * path);
diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h
index ee634943a4f5..5c0efc64f8a7 100644
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -157,7 +157,7 @@ struct freebsd32_ntp_adjtime_args {
 	char tp_l_[PADL_(struct timex32 *)]; struct timex32 * tp; char tp_r_[PADR_(struct timex32 *)];
 };
 struct freebsd32___sysctl_args {
-	char name_l_[PADL_(int *)]; int * name; char name_r_[PADR_(int *)];
+	char name_l_[PADL_(const int *)]; const int * name; char name_r_[PADR_(const int *)];
 	char namelen_l_[PADL_(u_int)]; u_int namelen; char namelen_r_[PADR_(u_int)];
 	char old_l_[PADL_(void *)]; void * old; char old_r_[PADR_(void *)];
 	char oldlenp_l_[PADL_(uint32_t *)]; uint32_t * oldlenp; char oldlenp_r_[PADR_(uint32_t *)];
diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c
index 37564a737a62..df445b15f86f 100644
--- a/sys/compat/freebsd32/freebsd32_systrace_args.c
+++ b/sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -932,7 +932,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	/* freebsd32___sysctl */
 	case 202: {
 		struct freebsd32___sysctl_args *p = params;
-		uarg[a++] = (intptr_t)p->name; /* int * */
+		uarg[a++] = (intptr_t)p->name; /* const int * */
 		uarg[a++] = p->namelen; /* u_int */
 		uarg[a++] = (intptr_t)p->old; /* void * */
 		uarg[a++] = (intptr_t)p->oldlenp; /* uint32_t * */
@@ -4901,7 +4901,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 	case 202:
 		switch (ndx) {
 		case 0:
-			p = "userland int *";
+			p = "userland const int *";
 			break;
 		case 1:
 			p = "u_int";
diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c
index 90b21616a558..467caa71f20d 100644
--- a/sys/kern/systrace_args.c
+++ b/sys/kern/systrace_args.c
@@ -955,7 +955,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	/* __sysctl */
 	case 202: {
 		struct __sysctl_args *p = params;
-		uarg[a++] = (intptr_t)p->name; /* int * */
+		uarg[a++] = (intptr_t)p->name; /* const int * */
 		uarg[a++] = p->namelen; /* u_int */
 		uarg[a++] = (intptr_t)p->old; /* void * */
 		uarg[a++] = (intptr_t)p->oldlenp; /* size_t * */
@@ -5033,7 +5033,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 	case 202:
 		switch (ndx) {
 		case 0:
-			p = "userland int *";
+			p = "userland const int *";
 			break;
 		case 1:
 			p = "u_int";
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index 94b5a0a7a95e..c7420ac6bb8c 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -546,7 +546,7 @@ struct setrlimit_args {
 	char rlp_l_[PADL_(struct rlimit *)]; struct rlimit * rlp; char rlp_r_[PADR_(struct rlimit *)];
 };
 struct __sysctl_args {
-	char name_l_[PADL_(int *)]; int * name; char name_r_[PADR_(int *)];
+	char name_l_[PADL_(const int *)]; const int * name; char name_r_[PADR_(const int *)];
 	char namelen_l_[PADL_(u_int)]; u_int namelen; char namelen_r_[PADR_(u_int)];
 	char old_l_[PADL_(void *)]; void * old; char old_r_[PADR_(void *)];
 	char oldlenp_l_[PADL_(size_t *)]; size_t * oldlenp; char oldlenp_r_[PADR_(size_t *)];



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202508011458.571Eweot015270>