From 423a3453b3da6bf524e3d1c9e48e424a48b0f638 Mon Sep 17 00:00:00 2001 From: martin Date: Sun, 26 Jan 2020 11:28:11 +0000 Subject: [PATCH] Pull up following revision(s) (requested by uwe in ticket #656): sys/ddb/db_command.c: revision 1.162 sys/ddb/db_command.c: revision 1.163 sys/ddb/db_command.c: revision 1.164 db_command - make sure count is always initialized. db_command - make setting have_addr more clear. Don't set it to false that it's already initialized to. db_command - don't hide local static variable in the middle of other local variable definitions. While here, get rid of the alignment of variable names. --- sys/ddb/db_command.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c index f42f337a3fbf..34e257b3c18e 100644 --- a/sys/ddb/db_command.c +++ b/sys/ddb/db_command.c @@ -1,4 +1,4 @@ -/* $NetBSD: db_command.c,v 1.160 2018/09/17 01:49:54 kre Exp $ */ +/* $NetBSD: db_command.c,v 1.160.4.1 2020/01/26 11:28:11 martin Exp $ */ /* * Copyright (c) 1996, 1997, 1998, 1999, 2002, 2009 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.160 2018/09/17 01:49:54 kre Exp $"); +__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.160.4.1 2020/01/26 11:28:11 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_aio.h" @@ -820,16 +820,18 @@ db_read_command(void) static void db_command(const struct db_command **last_cmdp) { - const struct db_command *command; static db_expr_t last_count = 0; - db_expr_t addr, count; - char modif[TOK_STRING_SIZE]; - - int t; - bool have_addr = false; + + int t; + const struct db_command *command; + db_expr_t addr, count; + bool have_addr; + char modif[TOK_STRING_SIZE]; command = NULL; - + have_addr = false; + count = -1; + t = db_read_token(); if ((t == tEOL) || (t == tCOMMA)) { /* @@ -850,7 +852,6 @@ db_command(const struct db_command **last_cmdp) } } else count = last_count; - have_addr = false; modif[0] = '\0'; db_skip_to_eol(); @@ -897,7 +898,6 @@ db_command(const struct db_command **last_cmdp) have_addr = true; } else { addr = (db_expr_t) db_dot; - have_addr = false; } t = db_read_token(); @@ -909,7 +909,6 @@ db_command(const struct db_command **last_cmdp) } } else { db_unread_token(t); - count = -1; } if ((command->flag & CS_MORE) == 0) { db_skip_to_eol();