Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

First caller to set a description on a node sets it. This allows one

Browse Source 
setup function to set the description, even if the node has been
instantiated elsewhere.  Or not, depending on the other that the setup
functions are called.
This commit is contained in:
atatat 2004-04-06 18:52:35 +00:00
parent 1649429e19
commit 275e2ae7f3
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/kern/kern_sysctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_sysctl.c,v 1.170 2004/04/01 04:50:06 atatat Exp $ */
/* $NetBSD: kern_sysctl.c,v 1.171 2004/04/06 18:52:35 atatat Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.170 2004/04/01 04:50:06 atatat Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.171 2004/04/06 18:52:35 atatat Exp $");
#include "opt_defcorename.h"
#include "opt_insecure.h"
@ -2007,13 +2007,21 @@ sysctl_createv(struct sysctllog **log, int cflags,
if (cnode != NULL)
*cnode = pnode;
if (descr != NULL) {
if (flags & CTLFLAG_OWNDESC) {
/*
* allow first caller to *set* a
* description actually to set it
*/
if (pnode->sysctl_desc != NULL)
/* skip it...we've got one */;
else if (flags & CTLFLAG_OWNDESC) {
size_t l = strlen(descr) + 1;
char *d = malloc(l, M_SYSCTLDATA,
M_WAITOK|M_CANFAIL);
if (d != NULL) {
memcpy(d, descr, l);
pnode->sysctl_desc = d;
pnode->sysctl_flags |=
CTLFLAG_OWNDESC;
}
}
else