From eb30c92e4910efd8f5aa99168e8b74d8414f3eb1 Mon Sep 17 00:00:00 2001 From: phk Date: Tue, 22 Jul 2003 10:36:36 +0000 Subject: Revert stuff which accidentally ended up in the previous commit. --- sys/kern/init_main.c | 5 ----- sys/kern/kern_malloc.c | 9 +++------ sys/kern/md5c.c | 1 - sys/kern/subr_autoconf.c | 3 --- sys/kern/subr_clist.c | 2 +- sys/kern/subr_prf.c | 20 -------------------- sys/kern/tty_subr.c | 2 +- sys/kern/vfs_cluster.c | 4 ++-- sys/kern/vfs_subr.c | 15 ++++++++------- 9 files changed, 15 insertions(+), 46 deletions(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 44e4193..9af07a9 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -211,11 +211,6 @@ restart: if ((*sipp)->subsystem == SI_SUB_DONE) continue; - if (0 && bootverbose) - printf("Sysinit %p(%p) subsys %x order %x\n", - (*sipp)->func, (*sipp)->udata, - (*sipp)->subsystem, (*sipp)->order); - /* Call function */ (*((*sipp)->func))((*sipp)->udata); diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 691b211..a90d628 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -272,16 +272,14 @@ out: * This routine may not block. */ void -free(arg, type) - void const *arg; +free(addr, type) + void *addr; struct malloc_type *type; { register struct malloc_type *ksp = type; uma_slab_t slab; u_long size; - void *addr; - addr = __DECONST(void *, arg); /* free(NULL, ...) does nothing */ if (addr == NULL) return; @@ -389,8 +387,7 @@ reallocf(addr, size, type, flags) { void *mem; - mem = realloc(addr, size, type, flags); - if (mem == NULL) + if ((mem = realloc(addr, size, type, flags)) == NULL) free(addr, type); return (mem); } diff --git a/sys/kern/md5c.c b/sys/kern/md5c.c index 1181329..af5471c 100644 --- a/sys/kern/md5c.c +++ b/sys/kern/md5c.c @@ -178,7 +178,6 @@ MD5Update (context, input, inputLen) i = 0; /* Buffer remaining input */ - /*lint -e{669} */ memcpy ((void *)&context->buffer[index], (const void *)&input[i], inputLen-i); } diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c index 23c7dc4..34c60bc 100644 --- a/sys/kern/subr_autoconf.c +++ b/sys/kern/subr_autoconf.c @@ -73,9 +73,6 @@ run_interrupt_driven_config_hooks(dummy) hook_entry != NULL; hook_entry = next_entry) { next_entry = TAILQ_NEXT(hook_entry, ich_links); - printf("IDCH: %p(%p)\n", - hook_entry->ich_func, - hook_entry->ich_arg); (*hook_entry->ich_func)(hook_entry->ich_arg); } diff --git a/sys/kern/subr_clist.c b/sys/kern/subr_clist.c index f59caf9..cc4b32a 100644 --- a/sys/kern/subr_clist.c +++ b/sys/kern/subr_clist.c @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); static void clist_init(void *); SYSINIT(clist, SI_SUB_CLIST, SI_ORDER_FIRST, clist_init, NULL) -static struct cblock *cfreelist = 0; /* XXX: use */ +static struct cblock *cfreelist = 0; int cfreecount = 0; static int cslushcount; static int ctotcount; diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index fa86217..d851e60 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -237,25 +237,6 @@ log(int level, const char *fmt, ...) msgbuftrigger = 1; } -int -vlog(const char *fmt, va_list ap) -{ - int savintr; - struct putchar_arg pca; - int retval; - - savintr = consintr; /* disable interrupts */ - consintr = 0; - pca.tty = NULL; - pca.flags = log_open ? TOLOG : TOCONS; - pca.pri = -1; - retval = kvprintf(fmt, putchar, &pca, 10, ap); - if (!panicstr) - msgbuftrigger = 1; - consintr = savintr; /* reenable interrupts */ - return (retval); -} - #define CONSCHUNK 128 void @@ -342,7 +323,6 @@ vprintf(const char *fmt, va_list ap) return (retval); } - /* * Print a character on console or users terminal. If destination is * the console then the last bunch of characters are saved in msgbuf for diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c index f59caf9..cc4b32a 100644 --- a/sys/kern/tty_subr.c +++ b/sys/kern/tty_subr.c @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); static void clist_init(void *); SYSINIT(clist, SI_SUB_CLIST, SI_ORDER_FIRST, clist_init, NULL) -static struct cblock *cfreelist = 0; /* XXX: use */ +static struct cblock *cfreelist = 0; int cfreecount = 0; static int cslushcount; static int ctotcount; diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index 34dffbb..ad0b55d 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -239,7 +239,7 @@ cluster_read(vp, filesize, lblkno, size, cred, totread, seqcount, bpp) bp->b_ioflags &= ~BIO_ERROR; if ((bp->b_flags & B_ASYNC) || bp->b_iodone != NULL) BUF_KERNPROC(bp); - error = BUF_STRATEGY(bp); + error = VOP_STRATEGY(vp, bp); curproc->p_stats->p_ru.ru_inblock++; if (error) return (error); @@ -293,7 +293,7 @@ cluster_read(vp, filesize, lblkno, size, cred, totread, seqcount, bpp) rbp->b_ioflags &= ~BIO_ERROR; if ((rbp->b_flags & B_ASYNC) || rbp->b_iodone != NULL) BUF_KERNPROC(rbp); - BUF_STRATEGY(rbp); + (void) VOP_STRATEGY(vp, rbp); curproc->p_stats->p_ru.ru_inblock++; } diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 25eed7f..cf0f0fb 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -3679,13 +3679,14 @@ NDFREE(ndp, flags) * request (obsoleted). Returns 0 on success, or an errno on failure. */ int -vaccess(enum vtype type, - mode_t file_mode, - uid_t file_uid, - gid_t file_gid, - mode_t acc_mode, - struct ucred *cred, - int *privused) +vaccess(type, file_mode, file_uid, file_gid, acc_mode, cred, privused) + enum vtype type; + mode_t file_mode; + uid_t file_uid; + gid_t file_gid; + mode_t acc_mode; + struct ucred *cred; + int *privused; { mode_t dac_granted; #ifdef CAPABILITIES -- cgit v1.1