From fa9c948c1cdfdc9f5d1658145ddd7fe0249f292a Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Sat, 23 Mar 2002 14:27:06 +0000 Subject: [PATCH] Fixed some style bugs in the removal of __P(()). The main ones were not removing tabs before "__P((", and not outdenting continuation lines to preserve non-KNF lining up of code with parentheses. Switch to KNF formatting and/or rewrap the whole prototype in some cases. --- sys/amd64/amd64/db_disasm.c | 8 ++++---- sys/amd64/amd64/db_trace.c | 4 ++-- sys/amd64/amd64/mp_machdep.c | 10 +++++----- sys/amd64/amd64/mptable.c | 10 +++++----- sys/amd64/amd64/sys_machdep.c | 10 +++++----- sys/amd64/include/mptable.h | 10 +++++----- sys/i386/i386/db_disasm.c | 8 ++++---- sys/i386/i386/db_trace.c | 4 ++-- sys/i386/i386/mp_machdep.c | 10 +++++----- sys/i386/i386/mptable.c | 10 +++++----- sys/i386/i386/sys_machdep.c | 10 +++++----- sys/i386/include/mptable.h | 10 +++++----- 12 files changed, 52 insertions(+), 52 deletions(-) diff --git a/sys/amd64/amd64/db_disasm.c b/sys/amd64/amd64/db_disasm.c index 43e6d1f2bd3..d45fc59505b 100644 --- a/sys/amd64/amd64/db_disasm.c +++ b/sys/amd64/amd64/db_disasm.c @@ -862,12 +862,12 @@ static const int db_lengths[] = { static db_addr_t db_disasm_esc(db_addr_t loc, int inst, int short_addr, - int size, const char *seg); + int size, const char *seg); static void db_print_address(const char *seg, int size, - struct i_addr *addrp); + struct i_addr *addrp); static db_addr_t - db_read_address(db_addr_t loc, int short_addr, - int regmodrm, struct i_addr *addrp); + db_read_address(db_addr_t loc, int short_addr, int regmodrm, + struct i_addr *addrp); /* * Read address at location and return updated location. diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c index c9324e7d1ba..f34747cfda1 100644 --- a/sys/amd64/amd64/db_trace.c +++ b/sys/amd64/amd64/db_trace.c @@ -111,8 +111,8 @@ static void decode_syscall(int, struct proc *); static char * watchtype_str(int type); -int i386_set_watch(int watchnum, unsigned int watchaddr, - int size, int access, struct dbreg * d); +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); int db_md_set_watchpoint(db_expr_t addr, db_expr_t size); int db_md_clr_watchpoint(db_expr_t addr, db_expr_t size); diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 96431918ff2..4f891db6d43 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -737,11 +737,11 @@ static io_int *io_apic_ints; static int nintrs; -static int processor_entry (proc_entry_ptr entry, int cpu); -static int bus_entry (bus_entry_ptr entry, int bus); -static int io_apic_entry (io_apic_entry_ptr entry, int apic); -static int int_entry (int_entry_ptr entry, int intr); -static int lookup_bus_type (char *name); +static int processor_entry(proc_entry_ptr entry, int cpu); +static int bus_entry(bus_entry_ptr entry, int bus); +static int io_apic_entry(io_apic_entry_ptr entry, int apic); +static int int_entry(int_entry_ptr entry, int intr); +static int lookup_bus_type(char *name); /* diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c index 96431918ff2..4f891db6d43 100644 --- a/sys/amd64/amd64/mptable.c +++ b/sys/amd64/amd64/mptable.c @@ -737,11 +737,11 @@ static io_int *io_apic_ints; static int nintrs; -static int processor_entry (proc_entry_ptr entry, int cpu); -static int bus_entry (bus_entry_ptr entry, int bus); -static int io_apic_entry (io_apic_entry_ptr entry, int apic); -static int int_entry (int_entry_ptr entry, int intr); -static int lookup_bus_type (char *name); +static int processor_entry(proc_entry_ptr entry, int cpu); +static int bus_entry(bus_entry_ptr entry, int bus); +static int io_apic_entry(io_apic_entry_ptr entry, int apic); +static int int_entry(int_entry_ptr entry, int intr); +static int lookup_bus_type(char *name); /* diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c index 365c25e0dc7..b039b519e67 100644 --- a/sys/amd64/amd64/sys_machdep.c +++ b/sys/amd64/amd64/sys_machdep.c @@ -66,12 +66,12 @@ -static int i386_get_ldt (struct thread *, char *); -static int i386_set_ldt (struct thread *, char *); -static int i386_get_ioperm (struct thread *, char *); -static int i386_set_ioperm (struct thread *, char *); +static int i386_get_ldt(struct thread *, char *); +static int i386_set_ldt(struct thread *, char *); +static int i386_get_ioperm(struct thread *, char *); +static int i386_set_ioperm(struct thread *, char *); #ifdef SMP -static void set_user_ldt_rv (struct thread *); +static void set_user_ldt_rv(struct thread *); #endif #ifndef _SYS_SYSPROTO_H_ diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h index 96431918ff2..4f891db6d43 100644 --- a/sys/amd64/include/mptable.h +++ b/sys/amd64/include/mptable.h @@ -737,11 +737,11 @@ static io_int *io_apic_ints; static int nintrs; -static int processor_entry (proc_entry_ptr entry, int cpu); -static int bus_entry (bus_entry_ptr entry, int bus); -static int io_apic_entry (io_apic_entry_ptr entry, int apic); -static int int_entry (int_entry_ptr entry, int intr); -static int lookup_bus_type (char *name); +static int processor_entry(proc_entry_ptr entry, int cpu); +static int bus_entry(bus_entry_ptr entry, int bus); +static int io_apic_entry(io_apic_entry_ptr entry, int apic); +static int int_entry(int_entry_ptr entry, int intr); +static int lookup_bus_type(char *name); /* diff --git a/sys/i386/i386/db_disasm.c b/sys/i386/i386/db_disasm.c index 43e6d1f2bd3..d45fc59505b 100644 --- a/sys/i386/i386/db_disasm.c +++ b/sys/i386/i386/db_disasm.c @@ -862,12 +862,12 @@ static const int db_lengths[] = { static db_addr_t db_disasm_esc(db_addr_t loc, int inst, int short_addr, - int size, const char *seg); + int size, const char *seg); static void db_print_address(const char *seg, int size, - struct i_addr *addrp); + struct i_addr *addrp); static db_addr_t - db_read_address(db_addr_t loc, int short_addr, - int regmodrm, struct i_addr *addrp); + db_read_address(db_addr_t loc, int short_addr, int regmodrm, + struct i_addr *addrp); /* * Read address at location and return updated location. diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c index c9324e7d1ba..f34747cfda1 100644 --- a/sys/i386/i386/db_trace.c +++ b/sys/i386/i386/db_trace.c @@ -111,8 +111,8 @@ static void decode_syscall(int, struct proc *); static char * watchtype_str(int type); -int i386_set_watch(int watchnum, unsigned int watchaddr, - int size, int access, struct dbreg * d); +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); int db_md_set_watchpoint(db_expr_t addr, db_expr_t size); int db_md_clr_watchpoint(db_expr_t addr, db_expr_t size); diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index 96431918ff2..4f891db6d43 100644 --- a/sys/i386/i386/mp_machdep.c +++ b/sys/i386/i386/mp_machdep.c @@ -737,11 +737,11 @@ static io_int *io_apic_ints; static int nintrs; -static int processor_entry (proc_entry_ptr entry, int cpu); -static int bus_entry (bus_entry_ptr entry, int bus); -static int io_apic_entry (io_apic_entry_ptr entry, int apic); -static int int_entry (int_entry_ptr entry, int intr); -static int lookup_bus_type (char *name); +static int processor_entry(proc_entry_ptr entry, int cpu); +static int bus_entry(bus_entry_ptr entry, int bus); +static int io_apic_entry(io_apic_entry_ptr entry, int apic); +static int int_entry(int_entry_ptr entry, int intr); +static int lookup_bus_type(char *name); /* diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c index 96431918ff2..4f891db6d43 100644 --- a/sys/i386/i386/mptable.c +++ b/sys/i386/i386/mptable.c @@ -737,11 +737,11 @@ static io_int *io_apic_ints; static int nintrs; -static int processor_entry (proc_entry_ptr entry, int cpu); -static int bus_entry (bus_entry_ptr entry, int bus); -static int io_apic_entry (io_apic_entry_ptr entry, int apic); -static int int_entry (int_entry_ptr entry, int intr); -static int lookup_bus_type (char *name); +static int processor_entry(proc_entry_ptr entry, int cpu); +static int bus_entry(bus_entry_ptr entry, int bus); +static int io_apic_entry(io_apic_entry_ptr entry, int apic); +static int int_entry(int_entry_ptr entry, int intr); +static int lookup_bus_type(char *name); /* diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c index 365c25e0dc7..b039b519e67 100644 --- a/sys/i386/i386/sys_machdep.c +++ b/sys/i386/i386/sys_machdep.c @@ -66,12 +66,12 @@ -static int i386_get_ldt (struct thread *, char *); -static int i386_set_ldt (struct thread *, char *); -static int i386_get_ioperm (struct thread *, char *); -static int i386_set_ioperm (struct thread *, char *); +static int i386_get_ldt(struct thread *, char *); +static int i386_set_ldt(struct thread *, char *); +static int i386_get_ioperm(struct thread *, char *); +static int i386_set_ioperm(struct thread *, char *); #ifdef SMP -static void set_user_ldt_rv (struct thread *); +static void set_user_ldt_rv(struct thread *); #endif #ifndef _SYS_SYSPROTO_H_ diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h index 96431918ff2..4f891db6d43 100644 --- a/sys/i386/include/mptable.h +++ b/sys/i386/include/mptable.h @@ -737,11 +737,11 @@ static io_int *io_apic_ints; static int nintrs; -static int processor_entry (proc_entry_ptr entry, int cpu); -static int bus_entry (bus_entry_ptr entry, int bus); -static int io_apic_entry (io_apic_entry_ptr entry, int apic); -static int int_entry (int_entry_ptr entry, int intr); -static int lookup_bus_type (char *name); +static int processor_entry(proc_entry_ptr entry, int cpu); +static int bus_entry(bus_entry_ptr entry, int bus); +static int io_apic_entry(io_apic_entry_ptr entry, int apic); +static int int_entry(int_entry_ptr entry, int intr); +static int lookup_bus_type(char *name); /*