Module Name: src
Committed By: maxv
Date: Sun Oct 18 17:13:33 UTC 2015
Modified Files:
src/sys/arch/hppa/hppa: machdep.c
src/sys/arch/m68k/m68k: db_trace.c
Log Message:
Add some {} when the meaning is too ambiguous. From Brainy.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/hppa/machdep.c
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/m68k/m68k/db_trace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/hppa/machdep.c
diff -u src/sys/arch/hppa/hppa/machdep.c:1.5 src/sys/arch/hppa/hppa/machdep.c:1.6
--- src/sys/arch/hppa/hppa/machdep.c:1.5 Sat Jul 11 10:32:46 2015
+++ src/sys/arch/hppa/hppa/machdep.c Sun Oct 18 17:13:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.5 2015/07/11 10:32:46 kamil Exp $ */
+/* $NetBSD: machdep.c,v 1.6 2015/10/18 17:13:33 maxv Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.5 2015/07/11 10:32:46 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.6 2015/10/18 17:13:33 maxv Exp $");
#include "opt_cputype.h"
#include "opt_ddb.h"
@@ -981,10 +981,11 @@ delay(u_int us)
end = start + n * cpu_ticksnum / cpu_ticksdenom;
/* N.B. Interval Timer may wrap around */
- if (end < start)
- do
+ if (end < start) {
+ do {
mfctl(CR_ITMR, start);
- while (start > end);
+ } while (start > end);
+ }
do
mfctl(CR_ITMR, start);
Index: src/sys/arch/m68k/m68k/db_trace.c
diff -u src/sys/arch/m68k/m68k/db_trace.c:1.58 src/sys/arch/m68k/m68k/db_trace.c:1.59
--- src/sys/arch/m68k/m68k/db_trace.c:1.58 Thu Nov 7 01:49:46 2013
+++ src/sys/arch/m68k/m68k/db_trace.c Sun Oct 18 17:13:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.58 2013/11/07 01:49:46 christos Exp $ */
+/* $NetBSD: db_trace.c,v 1.59 2015/10/18 17:13:32 maxv Exp $ */
/*
* Mach Operating System
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.58 2013/11/07 01:49:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.59 2015/10/18 17:13:32 maxv Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -404,7 +404,7 @@ db_stack_trace_print(db_expr_t addr, boo
const char *cp = modif;
char c;
- while ((c = *cp++) != 0)
+ while ((c = *cp++) != 0) {
if (c == 'a') {
lwpaddr = true;
trace_thread = true;
@@ -414,6 +414,7 @@ db_stack_trace_print(db_expr_t addr, boo
else if (c == 'u')
kernel_only = false;
#endif
+ }
}
if (!have_addr)
