From f9a4729a9b5e134850841ee06d85b97bf66e749b Mon Sep 17 00:00:00 2001 From: dillon Date: Wed, 27 Jan 1999 23:45:44 +0000 Subject: Fix warnings in preparation for adding -Wall -Wcast-qual to the kernel compile. This commit includes significant work to proper handle const arguments for the DDB symbol routines. --- sys/amd64/amd64/db_trace.c | 12 ++++++------ sys/ddb/db_aout.c | 4 ++-- sys/ddb/db_elf.c | 4 ++-- sys/ddb/db_kld.c | 24 ++++++++++++------------ sys/ddb/db_print.c | 6 +++--- sys/ddb/db_sym.c | 34 +++++++++++++++++----------------- sys/ddb/db_sym.h | 20 +++++++++++--------- sys/dev/de/if_de.c | 10 +++++----- sys/dev/fxp/if_fxp.c | 6 +++--- sys/fs/cd9660/cd9660_vfsops.c | 4 ++-- sys/gnu/ext2fs/ext2_vfsops.c | 4 ++-- sys/gnu/fs/ext2fs/ext2_vfsops.c | 4 ++-- sys/i386/i386/db_trace.c | 12 ++++++------ sys/isofs/cd9660/cd9660_vfsops.c | 4 ++-- sys/kern/kern_linker.c | 16 ++++++++-------- sys/kern/link_elf.c | 6 +++--- sys/kern/link_elf_obj.c | 6 +++--- sys/nfs/bootp_subr.c | 6 +++--- sys/nfs/krpc_subr.c | 6 +++--- sys/nfsclient/bootp_subr.c | 6 +++--- sys/nfsclient/krpc_subr.c | 6 +++--- sys/pccard/pccard.c | 8 ++++---- sys/pci/if_de.c | 10 +++++----- sys/pci/if_fxp.c | 6 +++--- sys/pci/if_mx.c | 6 +++--- sys/pci/intpm.c | 4 ++-- sys/pci/meteor.c | 2 +- sys/pci/ncr.c | 16 +++++++++++++--- sys/sys/linker.h | 14 +++++++------- 29 files changed, 139 insertions(+), 127 deletions(-) diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c index 526dba5..608dd5d 100644 --- a/sys/amd64/amd64/db_trace.c +++ b/sys/amd64/amd64/db_trace.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_trace.c,v 1.30 1998/07/08 10:53:58 bde Exp $ + * $Id: db_trace.c,v 1.31 1998/07/15 11:27:11 bde Exp $ */ #include @@ -83,7 +83,7 @@ struct i386_frame { static void db_nextframe __P((struct i386_frame **, db_addr_t *)); static int db_numargs __P((struct i386_frame *)); -static void db_print_stack_entry __P((char *, int, char **, int *, db_addr_t)); +static void db_print_stack_entry __P((const char *, int, char **, int *, db_addr_t)); /* * Figure out how many arguments were passed into the frame at "fp". @@ -118,7 +118,7 @@ db_numargs(fp) static void db_print_stack_entry(name, narg, argnp, argp, callpc) - char *name; + const char *name; int narg; char **argnp; int *argp; @@ -150,7 +150,7 @@ db_nextframe(fp, ip) int frame_type; int eip, esp, ebp; db_expr_t offset; - char *sym, *name; + const char *sym, *name; eip = db_get_value((int) &(*fp)->f_retaddr, 4, FALSE); ebp = db_get_value((int) &(*fp)->f_frame, 4, FALSE); @@ -257,9 +257,9 @@ db_stack_trace_cmd(addr, have_addr, count, modif) while (count--) { struct i386_frame *actframe; int narg; - char * name; + const char * name; db_expr_t offset; - db_sym_t sym; + c_db_sym_t sym; #define MAXNARG 16 char *argnames[MAXNARG], **argnp = NULL; diff --git a/sys/ddb/db_aout.c b/sys/ddb/db_aout.c index 41b3779..8d9b121 100644 --- a/sys/ddb/db_aout.c +++ b/sys/ddb/db_aout.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_aout.c,v 1.22 1998/10/09 23:29:44 peter Exp $ + * $Id: db_aout.c,v 1.23 1999/01/27 19:00:49 dillon Exp $ */ /* @@ -283,7 +283,7 @@ X_db_line_at_pc(symtab, cursym, filename, linenum, off) boolean_t X_db_sym_numargs(symtab, cursym, nargp, argnamep) db_symtab_t * symtab; - db_sym_t cursym; + c_db_sym_t cursym; int *nargp; char **argnamep; { diff --git a/sys/ddb/db_elf.c b/sys/ddb/db_elf.c index f5b4f4f..1eb9fa5 100644 --- a/sys/ddb/db_elf.c +++ b/sys/ddb/db_elf.c @@ -1,4 +1,4 @@ -/* $Id: db_elf.c,v 1.4 1998/10/09 23:32:03 peter Exp $ */ +/* $Id: db_elf.c,v 1.5 1999/01/27 19:00:49 dillon Exp $ */ /* $NetBSD: db_elf.c,v 1.4 1998/05/03 18:49:54 thorpej Exp $ */ /*- @@ -354,7 +354,7 @@ X_db_line_at_pc(symtab, cursym, filename, linenum, off) boolean_t X_db_sym_numargs(symtab, cursym, nargp, argnamep) db_symtab_t *symtab; - db_sym_t cursym; + c_db_sym_t cursym; int *nargp; char **argnamep; { diff --git a/sys/ddb/db_kld.c b/sys/ddb/db_kld.c index ec36a68..09246c7 100644 --- a/sys/ddb/db_kld.c +++ b/sys/ddb/db_kld.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_kld.c,v 1.4 1998/10/15 02:01:50 peter Exp $ + * $Id: db_kld.c,v 1.5 1999/01/27 19:00:49 dillon Exp $ * from db_aout.c,v 1.20 1998/06/07 17:09:36 dfr Exp */ @@ -46,20 +46,20 @@ #include #include -db_sym_t +c_db_sym_t X_db_lookup(stab, symstr) db_symtab_t *stab; const char * symstr; { - linker_sym_t sym; + c_linker_sym_t sym; if (linker_ddb_lookup(symstr, &sym) == 0) - return (db_sym_t) sym; + return (c_db_sym_t) sym; else - return (db_sym_t) 0; + return (c_db_sym_t) 0; } -db_sym_t +c_db_sym_t X_db_search_symbol(symtab, off, strategy, diffp) db_symtab_t * symtab; register @@ -67,12 +67,12 @@ X_db_search_symbol(symtab, off, strategy, diffp) db_strategy_t strategy; db_expr_t *diffp; /* in/out */ { - linker_sym_t sym; + c_linker_sym_t sym; long diff; if (linker_ddb_search_symbol((caddr_t) off, &sym, &diff) == 0) { *diffp = (db_expr_t) diff; - return (db_sym_t) sym; + return (c_db_sym_t) sym; } return 0; @@ -84,11 +84,11 @@ X_db_search_symbol(symtab, off, strategy, diffp) void X_db_symbol_values(symtab, dbsym, namep, valuep) db_symtab_t *symtab; - db_sym_t dbsym; + c_db_sym_t dbsym; const char **namep; db_expr_t *valuep; { - linker_sym_t sym = (linker_sym_t) dbsym; + c_linker_sym_t sym = (c_linker_sym_t) dbsym; linker_symval_t symval; linker_ddb_symbol_values(sym, &symval); @@ -102,7 +102,7 @@ X_db_symbol_values(symtab, dbsym, namep, valuep) boolean_t X_db_line_at_pc(symtab, cursym, filename, linenum, off) db_symtab_t * symtab; - db_sym_t cursym; + c_db_sym_t cursym; char **filename; int *linenum; db_expr_t off; @@ -113,7 +113,7 @@ X_db_line_at_pc(symtab, cursym, filename, linenum, off) boolean_t X_db_sym_numargs(symtab, cursym, nargp, argnamep) db_symtab_t * symtab; - db_sym_t cursym; + c_db_sym_t cursym; int *nargp; char **argnamep; { diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c index 5fe4b53..218be1e 100644 --- a/sys/ddb/db_print.c +++ b/sys/ddb/db_print.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_print.c,v 1.22 1998/07/08 09:11:37 bde Exp $ + * $Id: db_print.c,v 1.23 1998/07/08 10:53:49 bde Exp $ */ /* @@ -49,13 +49,13 @@ db_show_regs(dummy1, dummy2, dummy3, dummy4) { register struct db_variable *regp; db_expr_t value, offset; - char * name; + const char * name; for (regp = db_regs; regp < db_eregs; regp++) { db_read_variable(regp, &value); db_printf("%-12s%#10lr", regp->name, (unsigned long)value); db_find_xtrn_sym_and_offset((db_addr_t)value, &name, &offset); - if (name != 0 && offset <= (unsigned long)db_maxoff && + if (name != NULL && offset <= (unsigned long)db_maxoff && offset != value) { db_printf("\t%s", name); if (offset != 0) diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c index 55db7be..847a9c7 100644 --- a/sys/ddb/db_sym.c +++ b/sys/ddb/db_sym.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_sym.c,v 1.27 1998/12/04 22:54:43 archie Exp $ + * $Id: db_sym.c,v 1.28 1999/01/27 19:00:49 dillon Exp $ */ /* @@ -48,10 +48,10 @@ static int db_nsymtab = 0; static db_symtab_t *db_last_symtab; /* where last symbol was found */ -static db_sym_t db_lookup __P(( const char *symstr)); -static char *db_qualify __P((db_sym_t sym, char *symtabname)); -static boolean_t db_symbol_is_ambiguous __P((db_sym_t sym)); -static boolean_t db_line_at_pc __P((db_sym_t, char **, int *, +static c_db_sym_t db_lookup __P(( const char *symstr)); +static char *db_qualify __P((c_db_sym_t sym, char *symtabname)); +static boolean_t db_symbol_is_ambiguous __P((c_db_sym_t sym)); +static boolean_t db_line_at_pc __P((c_db_sym_t, char **, int *, db_expr_t)); /* @@ -84,7 +84,7 @@ db_add_symbol_table(start, end, name, ref) */ static char * db_qualify(sym, symtabname) - db_sym_t sym; + c_db_sym_t sym; register char *symtabname; { const char *symname; @@ -114,10 +114,10 @@ db_value_of_name(name, valuep) const char *name; db_expr_t *valuep; { - db_sym_t sym; + c_db_sym_t sym; sym = db_lookup(name); - if (sym == DB_SYM_NULL) + if (sym == C_DB_SYM_NULL) return (FALSE); db_symbol_values(sym, &name, valuep); return (TRUE); @@ -130,11 +130,11 @@ db_value_of_name(name, valuep) * then only the specified symbol table will be searched; * otherwise, all symbol tables will be searched. */ -static db_sym_t +static c_db_sym_t db_lookup(symstr) const char *symstr; { - db_sym_t sp; + c_db_sym_t sp; register int i; int symtab_start = 0; int symtab_end = db_nsymtab; @@ -190,7 +190,7 @@ static volatile boolean_t db_qualify_ambiguous_names = FALSE; */ static boolean_t db_symbol_is_ambiguous(sym) - db_sym_t sym; + c_db_sym_t sym; { const char *sym_name; register int i; @@ -215,7 +215,7 @@ db_symbol_is_ambiguous(sym) * Find the closest symbol to val, and return its name * and the difference between val and the symbol found. */ -db_sym_t +c_db_sym_t db_search_symbol( val, strategy, offp) register db_addr_t val; db_strategy_t strategy; @@ -225,7 +225,7 @@ db_search_symbol( val, strategy, offp) unsigned int diff; size_t newdiff; register int i; - db_sym_t ret = DB_SYM_NULL, sym; + c_db_sym_t ret = C_DB_SYM_NULL, sym; newdiff = diff = ~0; db_last_symtab = 0; @@ -246,7 +246,7 @@ db_search_symbol( val, strategy, offp) */ void db_symbol_values(sym, namep, valuep) - db_sym_t sym; + c_db_sym_t sym; const char **namep; db_expr_t *valuep; { @@ -294,7 +294,7 @@ db_printsym(off, strategy) const char *name; db_expr_t value; int linenum; - db_sym_t cursym; + c_db_sym_t cursym; cursym = db_search_symbol(off, strategy, &d); db_symbol_values(cursym, &name, &value); @@ -319,7 +319,7 @@ db_printsym(off, strategy) static boolean_t db_line_at_pc( sym, filename, linenum, pc) - db_sym_t sym; + c_db_sym_t sym; char **filename; int *linenum; db_expr_t pc; @@ -329,7 +329,7 @@ db_line_at_pc( sym, filename, linenum, pc) int db_sym_numargs(sym, nargp, argnames) - db_sym_t sym; + c_db_sym_t sym; int *nargp; char **argnames; { diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h index c501738..611bd28 100644 --- a/sys/ddb/db_sym.h +++ b/sys/ddb/db_sym.h @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_sym.h,v 1.15 1998/06/28 00:55:01 dfr Exp $ + * $Id: db_sym.h,v 1.16 1999/01/27 19:00:49 dillon Exp $ */ #ifndef _DDB_DB_SYM_H_ @@ -50,7 +50,9 @@ typedef struct { * a different one */ typedef char * db_sym_t; /* opaque handle on symbols */ +typedef const char * c_db_sym_t; /* opaque handle on symbols */ #define DB_SYM_NULL ((db_sym_t)0) +#define C_DB_SYM_NULL ((c_db_sym_t)0) /* * Non-stripped symbol tables will have duplicates, for instance @@ -70,10 +72,10 @@ typedef int db_strategy_t; /* search strategy */ void db_add_symbol_table __P((char *, char *, char *, char *)); /* extend the list of symbol tables */ -db_sym_t db_search_symbol __P((db_addr_t, db_strategy_t, db_expr_t *)); +c_db_sym_t db_search_symbol __P((db_addr_t, db_strategy_t, db_expr_t *)); /* find symbol given value */ -void db_symbol_values __P((db_sym_t, const char **, db_expr_t *)); +void db_symbol_values __P((c_db_sym_t, const char **, db_expr_t *)); /* return name and value of symbol */ #define db_find_sym_and_offset(val,namep,offp) \ @@ -90,19 +92,19 @@ int db_eqname __P((char *, char *, int)); void db_printsym __P((db_expr_t, db_strategy_t)); /* print closest symbol to a value */ -int db_sym_numargs __P((db_sym_t, int *, char **)); +int db_sym_numargs __P((c_db_sym_t, int *, char **)); -boolean_t X_db_line_at_pc __P((db_symtab_t *symtab, db_sym_t cursym, +boolean_t X_db_line_at_pc __P((db_symtab_t *symtab, c_db_sym_t cursym, char **filename, int *linenum, db_expr_t off)); -db_sym_t X_db_lookup __P((db_symtab_t *stab, const char *symstr)); -db_sym_t X_db_search_symbol __P((db_symtab_t *symtab, db_addr_t off, +c_db_sym_t X_db_lookup __P((db_symtab_t *stab, const char *symstr)); +c_db_sym_t X_db_search_symbol __P((db_symtab_t *symtab, db_addr_t off, db_strategy_t strategy, db_expr_t *diffp)); -int X_db_sym_numargs __P((db_symtab_t *, db_sym_t, int *, +int X_db_sym_numargs __P((db_symtab_t *, c_db_sym_t, int *, char **)); void X_db_symbol_values __P((db_symtab_t *symtab, - db_sym_t sym, const char **namep, + c_db_sym_t sym, const char **namep, db_expr_t *valuep)); #endif /* !_DDB_DB_SYM_H_ */ diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c index 8235427..c9c79ec 100644 --- a/sys/dev/de/if_de.c +++ b/sys/dev/de/if_de.c @@ -1,5 +1,5 @@ /* $NetBSD: if_de.c,v 1.80 1998/09/25 18:06:53 matt Exp $ */ -/* $Id: if_de.c,v 1.92 1998/12/14 05:47:26 dillon Exp $ */ +/* $Id: if_de.c,v 1.93 1998/12/30 00:37:43 hoek Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -2390,8 +2390,8 @@ tulip_srom_decode( { unsigned idx1, idx2, idx3; - const tulip_srom_header_t *shp = (tulip_srom_header_t *) &sc->tulip_rombuf[0]; - const tulip_srom_adapter_info_t *saip = (tulip_srom_adapter_info_t *) (shp + 1); + const tulip_srom_header_t *shp = (const tulip_srom_header_t *) &sc->tulip_rombuf[0]; + const tulip_srom_adapter_info_t *saip = (const tulip_srom_adapter_info_t *) (shp + 1); tulip_srom_media_t srom_media; tulip_media_info_t *mi = sc->tulip_mediainfo; const u_int8_t *dp; @@ -2972,8 +2972,8 @@ tulip_read_macaddr( * Check for various boards based on OUI. Did I say braindead? */ for (idx = 0; tulip_vendors[idx].vendor_identify_nic != NULL; idx++) { - if (bcmp((caddr_t) sc->tulip_enaddr, - (caddr_t) tulip_vendors[idx].vendor_oui, 3) == 0) { + if (bcmp((c_caddr_t) sc->tulip_enaddr, + (c_caddr_t) tulip_vendors[idx].vendor_oui, 3) == 0) { (*tulip_vendors[idx].vendor_identify_nic)(sc); break; } diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index 1908cb6..350546e 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_fxp.c,v 1.58 1998/10/22 02:00:49 dg Exp $ + * $Id: if_fxp.c,v 1.59 1998/12/14 05:47:27 dillon Exp $ */ /* @@ -123,8 +123,8 @@ static __inline void fxp_lwcopy(src, dst) volatile u_int32_t *src, *dst; { - volatile u_int16_t *a = (u_int16_t *)src; - volatile u_int16_t *b = (u_int16_t *)dst; + volatile u_int16_t *a = (volatile u_int16_t *)src; + volatile u_int16_t *b = (volatile u_int16_t *)dst; b[0] = a[0]; b[1] = a[1]; diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index 9560c3f..c07b637 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95 - * $Id: cd9660_vfsops.c,v 1.47 1999/01/17 20:41:02 peter Exp $ + * $Id: cd9660_vfsops.c,v 1.48 1999/01/27 21:49:55 dillon Exp $ */ #include @@ -160,7 +160,7 @@ iso_mountroot(mp, p) if (bootverbose) printf("iso_mountroot(): using session at block %d\n", args.ssector); - if (error = iso_mountfs(rootvp, mp, p, &args)) + if ((error = iso_mountfs(rootvp, mp, p, &args)) != 0) return (error); (void)cd9660_statfs(mp, &mp->mnt_stat, p); diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c index f8403f5..7bc8b7f 100644 --- a/sys/gnu/ext2fs/ext2_vfsops.c +++ b/sys/gnu/ext2fs/ext2_vfsops.c @@ -916,9 +916,9 @@ loop: nvp = vp->v_mntvnodes.le_next; ip = VTOI(vp); if (vp->v_type == VNON || - (ip->i_flag & + ((ip->i_flag & (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE)) == 0 && - (TAILQ_EMPTY(&vp->v_dirtyblkhd) || waitfor == MNT_LAZY)) { + (TAILQ_EMPTY(&vp->v_dirtyblkhd))) || waitfor == MNT_LAZY) { simple_unlock(&vp->v_interlock); continue; } diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c index f8403f5..7bc8b7f 100644 --- a/sys/gnu/fs/ext2fs/ext2_vfsops.c +++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c @@ -916,9 +916,9 @@ loop: nvp = vp->v_mntvnodes.le_next; ip = VTOI(vp); if (vp->v_type == VNON || - (ip->i_flag & + ((ip->i_flag & (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE)) == 0 && - (TAILQ_EMPTY(&vp->v_dirtyblkhd) || waitfor == MNT_LAZY)) { + (TAILQ_EMPTY(&vp->v_dirtyblkhd))) || waitfor == MNT_LAZY) { simple_unlock(&vp->v_interlock); continue; } diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c index 526dba5..608dd5d 100644 --- a/sys/i386/i386/db_trace.c +++ b/sys/i386/i386/db_trace.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_trace.c,v 1.30 1998/07/08 10:53:58 bde Exp $ + * $Id: db_trace.c,v 1.31 1998/07/15 11:27:11 bde Exp $ */ #include @@ -83,7 +83,7 @@ struct i386_frame { static void db_nextframe __P((struct i386_frame **, db_addr_t *)); static int db_numargs __P((struct i386_frame *)); -static void db_print_stack_entry __P((char *, int, char **, int *, db_addr_t)); +static void db_print_stack_entry __P((const char *, int, char **, int *, db_addr_t)); /* * Figure out how many arguments were passed into the frame at "fp". @@ -118,7 +118,7 @@ db_numargs(fp) static void db_print_stack_entry(name, narg, argnp, argp, callpc) - char *name; + const char *name; int narg; char **argnp; int *argp; @@ -150,7 +150,7 @@ db_nextframe(fp, ip) int frame_type; int eip, esp, ebp; db_expr_t offset; - char *sym, *name; + const char *sym, *name; eip = db_get_value((int) &(*fp)->f_retaddr, 4, FALSE); ebp = db_get_value((int) &(*fp)->f_frame, 4, FALSE); @@ -257,9 +257,9 @@ db_stack_trace_cmd(addr, have_addr, count, modif) while (count--) { struct i386_frame *actframe; int narg; - char * name; + const char * name; db_expr_t offset; - db_sym_t sym; + c_db_sym_t sym; #define MAXNARG 16 char *argnames[MAXNARG], **argnp = NULL; diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c index 9560c3f..c07b637 100644 --- a/sys/isofs/cd9660/cd9660_vfsops.c +++ b/sys/isofs/cd9660/cd9660_vfsops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95 - * $Id: cd9660_vfsops.c,v 1.47 1999/01/17 20:41:02 peter Exp $ + * $Id: cd9660_vfsops.c,v 1.48 1999/01/27 21:49:55 dillon Exp $ */ #include @@ -160,7 +160,7 @@ iso_mountroot(mp, p) if (bootverbose) printf("iso_mountroot(): using session at block %d\n", args.ssector); - if (error = iso_mountfs(rootvp, mp, p, &args)) + if ((error = iso_mountfs(rootvp, mp, p, &args)) != 0) return (error); (void)cd9660_statfs(mp, &mp->mnt_stat, p); diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index 6545741..6f67b44 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_linker.c,v 1.23 1999/01/25 08:42:24 dfr Exp $ + * $Id: kern_linker.c,v 1.24 1999/01/27 21:49:56 dillon Exp $ */ #include "opt_ddb.h" @@ -460,7 +460,7 @@ linker_file_add_dependancy(linker_file_t file, linker_file_t dep) caddr_t linker_file_lookup_symbol(linker_file_t file, const char* name, int deps) { - linker_sym_t sym; + c_linker_sym_t sym; linker_symval_t symval; linker_file_t lf; caddr_t address; @@ -566,7 +566,7 @@ linker_file_lookup_symbol(linker_file_t file, const char* name, int deps) */ int -linker_ddb_lookup(char *symstr, linker_sym_t *sym) +linker_ddb_lookup(const char *symstr, c_linker_sym_t *sym) { linker_file_t lf; @@ -578,13 +578,13 @@ linker_ddb_lookup(char *symstr, linker_sym_t *sym) } int -linker_ddb_search_symbol(caddr_t value, linker_sym_t *sym, long *diffp) +linker_ddb_search_symbol(caddr_t value, c_linker_sym_t *sym, long *diffp) { linker_file_t lf; u_long off = (u_long)value; u_long diff, bestdiff; - linker_sym_t best; - linker_sym_t es; + c_linker_sym_t best; + c_linker_sym_t es; best = 0; bestdiff = off; @@ -610,7 +610,7 @@ linker_ddb_search_symbol(caddr_t value, linker_sym_t *sym, long *diffp) } int -linker_ddb_symbol_values(linker_sym_t sym, linker_symval_t *symval) +linker_ddb_symbol_values(c_linker_sym_t sym, linker_symval_t *symval) { linker_file_t lf; @@ -822,7 +822,7 @@ int kldsym(struct proc *p, struct kldsym_args *uap) { char *symstr = NULL; - linker_sym_t sym; + c_linker_sym_t sym; linker_symval_t symval; linker_file_t lf; struct kld_sym_lookup lookup; diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index ffc38f0..91a78bf 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: link_elf.c,v 1.12 1999/01/25 08:42:24 dfr Exp $ + * $Id: link_elf.c,v 1.13 1999/01/27 21:49:56 dillon Exp $ */ #include @@ -51,7 +51,7 @@ static int link_elf_load_module(const char*, linker_file_t*); static int link_elf_load_file(const char*, linker_file_t*); static int link_elf_lookup_symbol(linker_file_t, const char*, c_linker_sym_t*); -static int link_elf_symbol_values(linker_file_t, linker_sym_t, linker_symval_t*); +static int link_elf_symbol_values(linker_file_t, c_linker_sym_t, linker_symval_t*); static int link_elf_search_symbol(linker_file_t, caddr_t value, c_linker_sym_t* sym, long* diffp); @@ -928,7 +928,7 @@ link_elf_lookup_symbol(linker_file_t lf, const char* name, c_linker_sym_t* sym) } static int -link_elf_symbol_values(linker_file_t lf, linker_sym_t sym, linker_symval_t* symval) +link_elf_symbol_values(linker_file_t lf, c_linker_sym_t sym, linker_symval_t* symval) { elf_file_t ef = lf->priv; Elf_Sym* es = (Elf_Sym*) sym; diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index ffc38f0..91a78bf 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: link_elf.c,v 1.12 1999/01/25 08:42:24 dfr Exp $ + * $Id: link_elf.c,v 1.13 1999/01/27 21:49:56 dillon Exp $ */ #include @@ -51,7 +51,7 @@ static int link_elf_load_module(const char*, linker_file_t*); static int link_elf_load_file(const char*, linker_file_t*); static int link_elf_lookup_symbol(linker_file_t, const char*, c_linker_sym_t*); -static int link_elf_symbol_values(linker_file_t, linker_sym_t, linker_symval_t*); +static int link_elf_symbol_values(linker_file_t, c_linker_sym_t, linker_symval_t*); static int link_elf_search_symbol(linker_file_t, caddr_t value, c_linker_sym_t* sym, long* diffp); @@ -928,7 +928,7 @@ link_elf_lookup_symbol(linker_file_t lf, const char* name, c_linker_sym_t* sym) } static int -link_elf_symbol_values(linker_file_t lf, linker_sym_t sym, linker_symval_t* symval) +link_elf_symbol_values(linker_file_t lf, c_linker_sym_t sym, linker_symval_t* symval) { elf_file_t ef = lf->priv; Elf_Sym* es = (Elf_Sym*) sym; diff --git a/sys/nfs/bootp_subr.c b/sys/nfs/bootp_subr.c index 1efca25..d91bf90 100644 --- a/sys/nfs/bootp_subr.c +++ b/sys/nfs/bootp_subr.c @@ -1,4 +1,4 @@ -/* $Id: bootp_subr.c,v 1.17 1998/12/04 22:54:54 archie Exp $ */ +/* $Id: bootp_subr.c,v 1.18 1998/12/07 21:58:43 archie Exp $ */ /* * Copyright (c) 1995 Gordon Ross, Adam Glass @@ -282,7 +282,7 @@ bootpc_call(call,reply,procp) sopt.sopt_val = &tv; sopt.sopt_valsize = sizeof tv; - if (error = sosetopt(so, &sopt)) + if ((error = sosetopt(so, &sopt)) != 0) goto out; /* @@ -292,7 +292,7 @@ bootpc_call(call,reply,procp) sopt.sopt_val = &on; sopt.sopt_valsize = sizeof on; sopt.sopt_name = SO_BROADCAST; - if (error = sosetopt(so, &sopt)) + if ((error = sosetopt(so, &sopt)) != 0) goto out; /* diff --git a/sys/nfs/krpc_subr.c b/sys/nfs/krpc_subr.c index ad01edb..fc232b9 100644 --- a/sys/nfs/krpc_subr.c +++ b/sys/nfs/krpc_subr.c @@ -1,5 +1,5 @@ /* $NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $ */ -/* $Id: krpc_subr.c,v 1.10 1998/08/18 00:32:48 bde Exp $ */ +/* $Id: krpc_subr.c,v 1.11 1998/08/23 03:07:16 wollman Exp $ */ /* * Copyright (c) 1995 Gordon Ross, Adam Glass @@ -230,7 +230,7 @@ krpc_call(sa, prog, vers, func, data, from_p, procp) sopt.sopt_val = &tv; sopt.sopt_valsize = sizeof tv; - if (error = sosetopt(so, &sopt)) + if ((error = sosetopt(so, &sopt)) != 0) goto out; /* @@ -241,7 +241,7 @@ krpc_call(sa, prog, vers, func, data, from_p, procp) sopt.sopt_name = SO_BROADCAST; sopt.sopt_val = &on; sopt.sopt_valsize = sizeof on; - if (error = sosetopt(so, &sopt)) + if ((error = sosetopt(so, &sopt)) != 0) goto out; } diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c index 1efca25..d91bf90 100644 --- a/sys/nfsclient/bootp_subr.c +++ b/sys/nfsclient/bootp_subr.c @@ -1,4 +1,4 @@ -/* $Id: bootp_subr.c,v 1.17 1998/12/04 22:54:54 archie Exp $ */ +/* $Id: bootp_subr.c,v 1.18 1998/12/07 21:58:43 archie Exp $ */ /* * Copyright (c) 1995 Gordon Ross, Adam Glass @@ -282,7 +282,7 @@ bootpc_call(call,reply,procp) sopt.sopt_val = &tv; sopt.sopt_valsize = sizeof tv; - if (error = sosetopt(so, &sopt)) + if ((error = sosetopt(so, &sopt)) != 0) goto out; /* @@ -292,7 +292,7 @@ bootpc_call(call,reply,procp) sopt.sopt_val = &on; sopt.sopt_valsize = sizeof on; sopt.sopt_name = SO_BROADCAST; - if (error = sosetopt(so, &sopt)) + if ((error = sosetopt(so, &sopt)) != 0) goto out; /* diff --git a/sys/nfsclient/krpc_subr.c b/sys/nfsclient/krpc_subr.c index ad01edb..fc232b9 100644 --- a/sys/nfsclient/krpc_subr.c +++ b/sys/nfsclient/krpc_subr.c @@ -1,5 +1,5 @@ /* $NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $ */ -/* $Id: krpc_subr.c,v 1.10 1998/08/18 00:32:48 bde Exp $ */ +/* $Id: krpc_subr.c,v 1.11 1998/08/23 03:07:16 wollman Exp $ */ /* * Copyright (c) 1995 Gordon Ross, Adam Glass @@ -230,7 +230,7 @@ krpc_call(sa, prog, vers, func, data, from_p, procp) sopt.sopt_val = &tv; sopt.sopt_valsize = sizeof tv; - if (error = sosetopt(so, &sopt)) + if ((error = sosetopt(so, &sopt)) != 0) goto out; /* @@ -241,7 +241,7 @@ krpc_call(sa, prog, vers, func, data, from_p, procp) sopt.sopt_name = SO_BROADCAST; sopt.sopt_val = &on; sopt.sopt_valsize = sizeof on; - if (error = sosetopt(so, &sopt)) + if ((error = sosetopt(so, &sopt)) != 0) goto out; } diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c index 3badb2e..05aa241 100644 --- a/sys/pccard/pccard.c +++ b/sys/pccard/pccard.c @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pccard.c,v 1.68 1999/01/19 00:18:26 peter Exp $ + * $Id: pccard.c,v 1.69 1999/01/27 10:10:03 bde Exp $ */ #include "opt_devfs.h" @@ -267,7 +267,7 @@ pccard_remove_controller(struct slot_ctrl *ctrl) /* * Unload the drivers attached to this slot. */ - while (devi = slt->devices) + while ((devi = slt->devices) != NULL) remove_device(devi); /* * Disable the slot and unlink the slot from the @@ -817,7 +817,7 @@ crdread(dev_t dev, struct uio *uio, int ioflag) mp->card = uio->uio_offset; mp->size = PCCARD_MEMSIZE; mp->start = (caddr_t)(void *)(uintptr_t)pccard_mem; - if (error = slt->ctrl->mapmem(slt, win)) + if ((error = slt->ctrl->mapmem(slt, win)) != 0) break; offs = (unsigned int)uio->uio_offset & (PCCARD_MEMSIZE - 1); p = pccard_kmem + offs; @@ -867,7 +867,7 @@ crdwrite(dev_t dev, struct uio *uio, int ioflag) mp->card = uio->uio_offset; mp->size = PCCARD_MEMSIZE; mp->start = (caddr_t)(void *)(uintptr_t)pccard_mem; - if (error = slt->ctrl->mapmem(slt, win)) + if ((error = slt->ctrl->mapmem(slt, win)) != 0) break; offs = (unsigned int)uio->uio_offset & (PCCARD_MEMSIZE - 1); p = pccard_kmem + offs; diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c index 8235427..c9c79ec 100644 --- a/sys/pci/if_de.c +++ b/sys/pci/if_de.c @@ -1,5 +1,5 @@ /* $NetBSD: if_de.c,v 1.80 1998/09/25 18:06:53 matt Exp $ */ -/* $Id: if_de.c,v 1.92 1998/12/14 05:47:26 dillon Exp $ */ +/* $Id: if_de.c,v 1.93 1998/12/30 00:37:43 hoek Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -2390,8 +2390,8 @@ tulip_srom_decode( { unsigned idx1, idx2, idx3; - const tulip_srom_header_t *shp = (tulip_srom_header_t *) &sc->tulip_rombuf[0]; - const tulip_srom_adapter_info_t *saip = (tulip_srom_adapter_info_t *) (shp + 1); + const tulip_srom_header_t *shp = (const tulip_srom_header_t *) &sc->tulip_rombuf[0]; + const tulip_srom_adapter_info_t *saip = (const tulip_srom_adapter_info_t *) (shp + 1); tulip_srom_media_t srom_media; tulip_media_info_t *mi = sc->tulip_mediainfo; const u_int8_t *dp; @@ -2972,8 +2972,8 @@ tulip_read_macaddr( * Check for various boards based on OUI. Did I say braindead? */ for (idx = 0; tulip_vendors[idx].vendor_identify_nic != NULL; idx++) { - if (bcmp((caddr_t) sc->tulip_enaddr, - (caddr_t) tulip_vendors[idx].vendor_oui, 3) == 0) { + if (bcmp((c_caddr_t) sc->tulip_enaddr, + (c_caddr_t) tulip_vendors[idx].vendor_oui, 3) == 0) { (*tulip_vendors[idx].vendor_identify_nic)(sc); break; } diff --git a/sys/pci/if_fxp.c b/sys/pci/if_fxp.c index 1908cb6..350546e 100644 --- a/sys/pci/if_fxp.c +++ b/sys/pci/if_fxp.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_fxp.c,v 1.58 1998/10/22 02:00:49 dg Exp $ + * $Id: if_fxp.c,v 1.59 1998/12/14 05:47:27 dillon Exp $ */ /* @@ -123,8 +123,8 @@ static __inline void fxp_lwcopy(src, dst) volatile u_int32_t *src, *dst; { - volatile u_int16_t *a = (u_int16_t *)src; - volatile u_int16_t *b = (u_int16_t *)dst; + volatile u_int16_t *a = (volatile u_int16_t *)src; + volatile u_int16_t *b = (volatile u_int16_t *)dst; b[0] = a[0]; b[1] = a[1]; diff --git a/sys/pci/if_mx.c b/sys/pci/if_mx.c index 621c3c7..8ea2472 100644 --- a/sys/pci/if_mx.c +++ b/sys/pci/if_mx.c @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_mx.c,v 1.33 1999/01/06 17:22:40 wpaul Exp $ + * $Id: if_mx.c,v 1.8 1999/01/06 17:30:06 wpaul Exp $ */ /* @@ -94,7 +94,7 @@ #ifndef lint static const char rcsid[] = - "$Id: if_mx.c,v 1.33 1999/01/06 17:22:40 wpaul Exp $"; + "$Id: if_mx.c,v 1.8 1999/01/06 17:30:06 wpaul Exp $"; #endif /* @@ -1571,7 +1571,7 @@ static int mx_list_rx_init(sc) for (i = 0; i < MX_RX_LIST_CNT; i++) { cd->mx_rx_chain[i].mx_ptr = - (struct mx_desc *)&ld->mx_rx_list[i]; + (volatile struct mx_desc *)&ld->mx_rx_list[i]; if (mx_newbuf(sc, &cd->mx_rx_chain[i]) == ENOBUFS) return(ENOBUFS); if (i == (MX_RX_LIST_CNT - 1)) { diff --git a/sys/pci/intpm.c b/sys/pci/intpm.c index b4f074b..3be56ae 100644 --- a/sys/pci/intpm.c +++ b/sys/pci/intpm.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: intpm.c,v 1.1 1999/01/24 18:13:31 nsouch Exp $ + * $Id: intpm.c,v 1.2 1999/01/27 18:36:49 dillon Exp $ */ #include "pci.h" @@ -308,7 +308,7 @@ static void intsmb_alrintr(device_t dev) volatile u_int8_t *addr; addr=bus_space_read_1(sc->st,sc->sh, PIIX4_SMBHSTDAT0); - printf("ALART_RESPONSE: %x\n",(int) addr); + printf("ALART_RESPONSE: %p\n",(int) addr); } }else{ printf("ERROR\n"); diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c index f81578d..7f0fcf6 100644 --- a/sys/pci/meteor.c +++ b/sys/pci/meteor.c @@ -1705,7 +1705,7 @@ meteor_ioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct proc *pr) } if(error) return error; - if (temp=geo->rows * geo->columns * geo->frames * 2) { + if ((temp=geo->rows * geo->columns * geo->frames * 2) != 0) { if (geo->oformat & METEOR_GEO_RGB24) temp = temp * 2; /* meteor_mem structure for SYNC Capture */ diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c index 79d8eae..16e7bf6 100644 --- a/sys/pci/ncr.c +++ b/sys/pci/ncr.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: ncr.c,v 1.140 1998/12/14 05:47:27 dillon Exp $ +** $Id: ncr.c,v 1.141 1998/12/30 00:37:44 hoek Exp $ ** ** Device driver for the NCR 53C8XX PCI-SCSI-Controller Family. ** @@ -1315,13 +1315,17 @@ static void ncr_freeze_devq (ncb_p np, struct cam_path *path); static void ncr_selectclock (ncb_p np, u_char scntl3); static void ncr_getclock (ncb_p np, u_char multiplier); static nccb_p ncr_get_nccb (ncb_p np, u_long t,u_long l); +#if 0 static u_int32_t ncr_info (int unit); +#endif static void ncr_init (ncb_p np, char * msg, u_long code); static void ncr_intr (void *vnp); static void ncr_int_ma (ncb_p np, u_char dstat); static void ncr_int_sir (ncb_p np); static void ncr_int_sto (ncb_p np); +#if 0 static void ncr_min_phys (struct buf *bp); +#endif static void ncr_poll (struct cam_sim *sim); static void ncb_profile (ncb_p np, nccb_p cp); static void ncr_script_copy_and_bind @@ -1357,7 +1361,7 @@ static void ncr_attach (pcici_t tag, int unit); #if !defined(lint) static const char ident[] = - "\n$Id: ncr.c,v 1.140 1998/12/14 05:47:27 dillon Exp $\n"; + "\n$Id: ncr.c,v 1.141 1998/12/30 00:37:44 hoek Exp $\n"; #endif static const u_long ncr_version = NCR_VERSION * 11 @@ -3239,6 +3243,7 @@ static void ncr_script_copy_and_bind (ncb_p np, ncrcmd *src, ncrcmd *dst, int le **========================================================== */ +#if 0 /*---------------------------------------------------------- ** ** Reduce the transfer length to the max value @@ -3259,6 +3264,9 @@ void ncr_min_phys (struct buf *bp) if ((unsigned long)bp->b_bcount > MAX_SIZE) bp->b_bcount = MAX_SIZE; } +#endif + +#if 0 /*---------------------------------------------------------- ** ** Maximal number of outstanding requests per target. @@ -3271,6 +3279,8 @@ u_int32_t ncr_info (int unit) return (1); /* may be changed later */ } +#endif + /*---------------------------------------------------------- ** ** NCR chip devices table and chip look up function. @@ -5457,7 +5467,7 @@ void ncr_exception (ncb_p np) int i; np->regtime = time_second; for (i=0; iregdump); i++) - ((char*)&np->regdump)[i] = INB_OFF(i); + ((volatile char*)&np->regdump)[i] = INB_OFF(i); np->regdump.nc_dstat = dstat; np->regdump.nc_sist = sist; }; diff --git a/sys/sys/linker.h b/sys/sys/linker.h index 2c699fa..32aad6d 100644 --- a/sys/sys/linker.h +++ b/sys/sys/linker.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: linker.h,v 1.12 1999/01/25 08:42:24 dfr Exp $ + * $Id: linker.h,v 1.13 1999/01/27 21:50:00 dillon Exp $ */ #ifndef _SYS_LINKER_H_ @@ -64,13 +64,13 @@ struct linker_file_ops { * set *address the value of the symbol. */ int (*lookup_symbol)(linker_file_t, const char* name, - linker_sym_t* sym); + c_linker_sym_t* sym); - int (*symbol_values)(linker_file_t, linker_sym_t, + int (*symbol_values)(linker_file_t, c_linker_sym_t, linker_symval_t*); int (*search_symbol)(linker_file_t, caddr_t value, - linker_sym_t* sym, long* diffp); + c_linker_sym_t* sym, long* diffp); /* * Unload a file, releasing dependancies and freeing storage. @@ -193,9 +193,9 @@ char *linker_search_path(const char *filename); /* * DDB Helpers, tuned specifically for ddb/db_kld.c */ -int linker_ddb_lookup(char *symstr, linker_sym_t *sym); -int linker_ddb_search_symbol(caddr_t value, linker_sym_t *sym, long *diffp); -int linker_ddb_symbol_values(linker_sym_t sym, linker_symval_t *symval); +int linker_ddb_lookup(const char *symstr, c_linker_sym_t *sym); +int linker_ddb_search_symbol(caddr_t value, c_linker_sym_t *sym, long *diffp); +int linker_ddb_symbol_values(c_linker_sym_t sym, linker_symval_t *symval); #endif /* KERNEL */ -- cgit v1.1