Module Name: src
Committed By: tsutsui
Date: Tue Apr 13 11:22:22 UTC 2010
Modified Files:
src/sys/arch/atari/atari: atari_init.c bus.c disksubr.c intr.c
machdep.c stalloc.c
Log Message:
Misc KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/atari/atari/atari_init.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/atari/atari/bus.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/atari/atari/disksubr.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/atari/atari/intr.c
cvs rdiff -u -r1.166 -r1.167 src/sys/arch/atari/atari/machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/atari/atari/stalloc.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/atari/atari/atari_init.c
diff -u src/sys/arch/atari/atari/atari_init.c:1.92 src/sys/arch/atari/atari/atari_init.c:1.93
--- src/sys/arch/atari/atari/atari_init.c:1.92 Fri Dec 11 22:23:08 2009
+++ src/sys/arch/atari/atari/atari_init.c Tue Apr 13 11:22:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: atari_init.c,v 1.92 2009/12/11 22:23:08 tsutsui Exp $ */
+/* $NetBSD: atari_init.c,v 1.93 2010/04/13 11:22:22 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.92 2009/12/11 22:23:08 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.93 2010/04/13 11:22:22 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_mbtype.h"
@@ -525,7 +525,7 @@
lp = (paddr_t *)0;
le = (paddr_t *)pstart;
fp = (paddr_t *)kbase;
- while(lp < le)
+ while (lp < le)
*fp++ = *lp++;
}
#if defined(M68040) || defined(M68060)
@@ -747,7 +747,7 @@
#else
pg_proto = STIO_PHYS | PG_RW | PG_CI | PG_V;
#endif
- while(pg < epg) {
+ while (pg < epg) {
*pg++ = pg_proto;
pg_proto += PAGE_SIZE;
}
Index: src/sys/arch/atari/atari/bus.c
diff -u src/sys/arch/atari/atari/bus.c:1.52 src/sys/arch/atari/atari/bus.c:1.53
--- src/sys/arch/atari/atari/bus.c:1.52 Wed Mar 31 13:15:52 2010
+++ src/sys/arch/atari/atari/bus.c Tue Apr 13 11:22:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.52 2010/03/31 13:15:52 tsutsui Exp $ */
+/* $NetBSD: bus.c,v 1.53 2010/04/13 11:22:22 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.52 2010/03/31 13:15:52 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.53 2010/04/13 11:22:22 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -110,7 +110,7 @@
pg_proto = pa | PG_RW | PG_V;
if (!(flags & BUS_SPACE_MAP_CACHEABLE))
pg_proto |= PG_CI;
- while(pg < epg) {
+ while (pg < epg) {
*pg++ = pg_proto;
pg_proto += PAGE_SIZE;
#if defined(M68040) || defined(M68060)
@@ -245,7 +245,7 @@
*bshp = va + (bpa & PGOFSET);
- for(; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
+ for (; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
u_int *ptep, npte;
pmap_enter(pmap_kernel(), (vaddr_t)va, pa,
Index: src/sys/arch/atari/atari/disksubr.c
diff -u src/sys/arch/atari/atari/disksubr.c:1.42 src/sys/arch/atari/atari/disksubr.c:1.43
--- src/sys/arch/atari/atari/disksubr.c:1.42 Wed Mar 31 14:12:55 2010
+++ src/sys/arch/atari/atari/disksubr.c Tue Apr 13 11:22:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.42 2010/03/31 14:12:55 tsutsui Exp $ */
+/* $NetBSD: disksubr.c,v 1.43 2010/04/13 11:22:22 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.42 2010/03/31 14:12:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.43 2010/04/13 11:22:22 tsutsui Exp $");
#ifndef DISKLABEL_NBDA
#define DISKLABEL_NBDA /* required */
@@ -509,7 +509,7 @@
break;
}
if (pno < 0) {
- if((pno = user_part + 1) >= MAXPARTITIONS)
+ if ((pno = user_part + 1) >= MAXPARTITIONS)
continue;
user_part = pno;
}
Index: src/sys/arch/atari/atari/intr.c
diff -u src/sys/arch/atari/atari/intr.c:1.21 src/sys/arch/atari/atari/intr.c:1.22
--- src/sys/arch/atari/atari/intr.c:1.21 Wed Mar 31 14:12:55 2010
+++ src/sys/arch/atari/atari/intr.c Tue Apr 13 11:22:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.21 2010/03/31 14:12:55 tsutsui Exp $ */
+/* $NetBSD: intr.c,v 1.22 2010/04/13 11:22:22 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.21 2010/03/31 14:12:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.22 2010/04/13 11:22:22 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -226,7 +226,7 @@
struct intrhand *cur_vec;
vector = ih->ih_vector;
- switch(ih->ih_type & (AUTO_VEC|USER_VEC)) {
+ switch (ih->ih_type & (AUTO_VEC|USER_VEC)) {
case AUTO_VEC:
if (vector < AVEC_MIN || vector > AVEC_MAX)
return 0;
Index: src/sys/arch/atari/atari/machdep.c
diff -u src/sys/arch/atari/atari/machdep.c:1.166 src/sys/arch/atari/atari/machdep.c:1.167
--- src/sys/arch/atari/atari/machdep.c:1.166 Wed Mar 31 14:12:55 2010
+++ src/sys/arch/atari/atari/machdep.c Tue Apr 13 11:22:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.166 2010/03/31 14:12:55 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.167 2010/04/13 11:22:22 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.166 2010/03/31 14:12:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.167 2010/04/13 11:22:22 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -795,7 +795,7 @@
void (*function)(void *, void *);
do {
- s = splhigh ();
+ s = splhigh();
if ((si = si_callbacks) != NULL)
si_callbacks = si->next;
splx(s);
@@ -804,7 +804,7 @@
function = si->function;
rock1 = si->rock1;
rock2 = si->rock2;
- s = splhigh ();
+ s = splhigh();
if (si_callbacks)
softint_schedule(si_callback_cookie);
si->next = si_free;
Index: src/sys/arch/atari/atari/stalloc.c
diff -u src/sys/arch/atari/atari/stalloc.c:1.12 src/sys/arch/atari/atari/stalloc.c:1.13
--- src/sys/arch/atari/atari/stalloc.c:1.12 Wed Mar 18 10:22:24 2009
+++ src/sys/arch/atari/atari/stalloc.c Tue Apr 13 11:22:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: stalloc.c,v 1.12 2009/03/18 10:22:24 cegger Exp $ */
+/* $NetBSD: stalloc.c,v 1.13 2010/04/13 11:22:22 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman (Atari modifications)
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stalloc.c,v 1.12 2009/03/18 10:22:24 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stalloc.c,v 1.13 2010/04/13 11:22:22 tsutsui Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -95,14 +95,14 @@
*/
bfit = NULL;
mn = free_list.cqh_first;
- for(; mn != (void *)&free_list; mn = mn->free_link.cqe_next) {
- if(size <= mn->size) {
- if((bfit != NULL) && (bfit->size < mn->size))
+ for (; mn != (void *)&free_list; mn = mn->free_link.cqe_next) {
+ if (size <= mn->size) {
+ if ((bfit != NULL) && (bfit->size < mn->size))
continue;
bfit = mn;
}
}
- if(bfit != NULL)
+ if (bfit != NULL)
mn = bfit;
if (mn == (void *)&free_list) {
printf("St-mem pool exhausted, binpatch 'st_pool_size'"
