summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-07-06 18:14:50 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-07-06 18:14:50 +0000
commit027ac5c978baf9cc4618090fab292d9bea109990 (patch)
tree508149a8a46de043c3a5df3fa9534bb2b9f5ec6e
parenta39609914ae952f693e19479146b2fce4ef92098 (diff)
Make the ddb.log sysctl available as an in-ddb variable, $log, for consistency.
-rw-r--r--sys/ddb/db_output.h4
-rw-r--r--sys/ddb/db_var.h3
-rw-r--r--sys/ddb/db_variables.c3
-rw-r--r--sys/kern/subr_prf.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h
index 2a9630c9123..039ed21ce79 100644
--- a/sys/ddb/db_output.h
+++ b/sys/ddb/db_output.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_output.h,v 1.14 2003/08/24 01:27:07 avsm Exp $ */
+/* $OpenBSD: db_output.h,v 1.15 2006/07/06 18:14:48 miod Exp $ */
/* $NetBSD: db_output.h,v 1.9 1996/04/04 05:13:50 cgd Exp $ */
/*
@@ -40,8 +40,6 @@ int db_printf(const char *, ...)
__attribute__((__format__(__kprintf__,1,2)));
void db_end_line(int);
-extern int db_log;
-
/*
* This is a replacement for the non-standard %z, %n and %r printf formats
* in db_printf.
diff --git a/sys/ddb/db_var.h b/sys/ddb/db_var.h
index b9a1b6bbc28..01ee75e0388 100644
--- a/sys/ddb/db_var.h
+++ b/sys/ddb/db_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_var.h,v 1.8 2003/06/28 01:52:18 tedu Exp $ */
+/* $OpenBSD: db_var.h,v 1.9 2006/07/06 18:14:48 miod Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff. All rights reserved.
@@ -62,6 +62,7 @@ extern int db_tab_stop_width;
extern int db_max_line;
extern int db_panic;
extern int db_console;
+extern int db_log;
int ddb_sysctl(int *, u_int, void *, size_t *, void *, size_t,
struct proc *);
diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c
index 95399e25aed..f5fd5725fba 100644
--- a/sys/ddb/db_variables.c
+++ b/sys/ddb/db_variables.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_variables.c,v 1.10 2006/03/13 06:23:20 jsg Exp $ */
+/* $OpenBSD: db_variables.c,v 1.11 2006/07/06 18:14:48 miod Exp $ */
/* $NetBSD: db_variables.c,v 1.8 1996/02/05 01:57:19 christos Exp $ */
/*
@@ -47,6 +47,7 @@ struct db_variable db_vars[] = {
{ "maxwidth", (long *)&db_max_width, FCN_NULL },
{ "tabstops", (long *)&db_tab_stop_width, FCN_NULL },
{ "lines", (long *)&db_max_line, FCN_NULL },
+ { "log", (long *)&db_log, FCN_NULL }
};
struct db_variable *db_evars = db_vars + sizeof(db_vars)/sizeof(db_vars[0]);
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index 4ad5ed3cea7..2c48e926320 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_prf.c,v 1.66 2006/06/01 23:17:23 jason Exp $ */
+/* $OpenBSD: subr_prf.c,v 1.67 2006/07/06 18:14:49 miod Exp $ */
/* $NetBSD: subr_prf.c,v 1.45 1997/10/24 18:14:25 chuck Exp $ */
/*-
@@ -68,7 +68,7 @@
#endif
#ifdef DDB
#include <ddb/db_output.h> /* db_printf, db_putchar prototypes */
-extern int db_radix; /* XXX: for non-standard '%r' format */
+#include <ddb/db_var.h> /* db_log, db_radix */
#endif
#if defined(UVM_SWAP_ENCRYPT)
extern int uvm_doswapencrypt;