2 files changed, 7 insertions, 9 deletions

diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c
index 57f6e482b7e1..f6b033e686bd 100644
--- a/sys/amd64/amd64/db_trace.c
+++ b/sys/amd64/amd64/db_trace.c
@@ -200,7 +200,7 @@ static int db_numargs(struct amd64_frame *);
 static void db_print_stack_entry(const char *, int, char **, long *, db_addr_t);
 static void decode_syscall(int, struct thread *);
 
-static char * watchtype_str(int type);
+static const char * watchtype_str(int type);
 int  amd64_set_watch(int watchnum, unsigned long watchaddr, int size,
 		    int access, struct dbreg *d);
 int  amd64_clr_watch(int watchnum, struct dbreg *d);
@@ -648,8 +648,8 @@ db_md_clr_watchpoint(addr, size)
 	db_expr_t addr;
 	db_expr_t size;
 {
-	int i;
 	struct dbreg d;
+	int i;
 
 	fill_dbregs(NULL, &d);
 
@@ -668,8 +668,7 @@ db_md_clr_watchpoint(addr, size)
 }
 
 
-static
-char *
+static const char *
 watchtype_str(type)
 	int type;
 {
diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c
index b6d3f9c9878f..6f4c3e405b06 100644
--- a/sys/i386/i386/db_trace.c
+++ b/sys/i386/i386/db_trace.c
@@ -190,7 +190,7 @@ static int db_numargs(struct i386_frame *);
 static void db_print_stack_entry(const char *, int, char **, int *, db_addr_t);
 static void decode_syscall(int, struct thread *);
 
-static char * watchtype_str(int type);
+static const char * watchtype_str(int type);
 int  i386_set_watch(int watchnum, unsigned int watchaddr, int size, int access,
 		    struct dbreg *d);
 int  i386_clr_watch(int watchnum, struct dbreg *d);
@@ -681,8 +681,8 @@ db_md_clr_watchpoint(addr, size)
 	db_expr_t addr;
 	db_expr_t size;
 {
-	int i;
 	struct dbreg d;
+	int i;
 
 	fill_dbregs(NULL, &d);
 
@@ -701,8 +701,7 @@ db_md_clr_watchpoint(addr, size)
 }
 
 
-static
-char *
+static const char *
 watchtype_str(type)
 	int type;
 {
@@ -741,7 +740,7 @@ db_md_list_watchpoints()
 
 	db_printf("\ndebug register values:\n");
 	for (i = 0; i < 8; i++) {
-		db_printf("  dr%d 0x%08x\n", i, DBREG_DRX((&d),i));
+		db_printf("  dr%d 0x%08x\n", i, DBREG_DRX((&d), i));
 	}
 	db_printf("\n");
 }