d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify the kernel configuration file return code.

Browse Source 
Reviewed by: wkoszek
This commit is contained in:
Warner Losh 2007-05-28 20:41:10 +00:00
parent 1e62d77c09
commit cfa7a8beea
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/kern/kern_mib.c
View File

@ -316,29 +316,10 @@ extern char kernconfstring[];
static int static int
sysctl_kern_config(SYSCTL_HANDLER_ARGS) sysctl_kern_config(SYSCTL_HANDLER_ARGS)
{ {
struct sbuf *sb; return (sysctl_handle_string(oidp, kernconfstring,
int error; strlen(kernconfstring), req));
char *p;
sb = sbuf_new(NULL, NULL, 2048, SBUF_AUTOEXTEND);
if (sb == NULL)
return (ENOMEM);
sbuf_clear(sb);
p = kernconfstring;
if (p == NULL || *p == '\0') {
sbuf_printf(sb, "No kernel configuration\n");
} else {
sbuf_printf(sb, "%s", p);
}
sbuf_trim(sb);
sbuf_putc(sb, '\n');
sbuf_finish(sb);
error = sysctl_handle_string(oidp, sbuf_data(sb), sbuf_len(sb), req);
if (error)
return (error);
sbuf_delete(sb);
return (error);
} }
SYSCTL_PROC(_kern, OID_AUTO, conftxt, CTLTYPE_STRING|CTLFLAG_RW, SYSCTL_PROC(_kern, OID_AUTO, conftxt, CTLTYPE_STRING|CTLFLAG_RW,
0, 0, sysctl_kern_config, "", "Kernel configuration file"); 0, 0, sysctl_kern_config, "", "Kernel configuration file");
#endif #endif