Date: Sat, 23 Mar 2002 08:25:09 -0800 (PST) From: Poul-Henning Kamp <phk@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 8267 for review Message-ID: <200203231625.g2NGP9x79085@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8267 Change 8267 by phk@phk_flat on 2002/03/23 08:24:38 Various style changes from current Affected files ... ... //depot/projects/sparc64/sys/sys/bio.h#6 integrate ... //depot/projects/sparc64/sys/sys/filedesc.h#8 integrate ... //depot/projects/sparc64/sys/sys/msgbuf.h#4 integrate ... //depot/projects/sparc64/sys/sys/protosw.h#6 integrate ... //depot/projects/sparc64/sys/sys/socketvar.h#14 integrate ... //depot/projects/sparc64/sys/sys/sysent.h#5 integrate ... //depot/projects/sparc64/sys/sys/systm.h#19 integrate Differences ... ==== //depot/projects/sparc64/sys/sys/bio.h#6 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)buf.h 8.9 (Berkeley) 3/30/95 - * $FreeBSD: src/sys/sys/bio.h,v 1.111 2002/03/19 20:18:36 alfred Exp $ + * $FreeBSD: src/sys/sys/bio.h,v 1.112 2002/03/23 08:46:51 bde Exp $ */ #ifndef _SYS_BIO_H_ @@ -144,9 +144,9 @@ static __inline void bioq_init(struct bio_queue_head *head); static __inline void bioq_insert_tail(struct bio_queue_head *head, - struct bio *bp); + struct bio *bp); static __inline void bioq_remove(struct bio_queue_head *head, - struct bio *bp); + struct bio *bp); static __inline struct bio *bioq_first(struct bio_queue_head *head); static __inline void ==== //depot/projects/sparc64/sys/sys/filedesc.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)filedesc.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/sys/sys/filedesc.h,v 1.38 2002/03/19 20:18:36 alfred Exp $ + * $FreeBSD: src/sys/sys/filedesc.h,v 1.39 2002/03/23 08:46:51 bde Exp $ */ #ifndef _SYS_FILEDESC_H_ @@ -139,8 +139,8 @@ #define FILEDESC_LOCK_ASSERT(fd, type) mtx_assert(&(fd)->fd_mtx, (type)) int closef(struct file *fp, struct thread *p); -int dupfdopen(struct thread *td, struct filedesc *fdp, int indx, - int dfd, int mode, int error); +int dupfdopen(struct thread *td, struct filedesc *fdp, int indx, int dfd, + int mode, int error); int falloc(struct thread *p, struct file **resultfp, int *resultfd); int fdalloc(struct thread *p, int want, int *result); int fdavail(struct thread *td, int n); ==== //depot/projects/sparc64/sys/sys/msgbuf.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)msgbuf.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/sys/sys/msgbuf.h,v 1.17 2002/03/19 20:18:40 alfred Exp $ + * $FreeBSD: src/sys/sys/msgbuf.h,v 1.18 2002/03/23 08:46:52 bde Exp $ */ #ifndef _SYS_MSGBUF_H_ @@ -49,7 +49,7 @@ #ifdef _KERNEL extern int msgbuftrigger; extern struct msgbuf *msgbufp; -void msgbufinit (void *ptr, size_t size); +void msgbufinit(void *ptr, size_t size); #if !defined(MSGBUF_SIZE) #define MSGBUF_SIZE 32768 ==== //depot/projects/sparc64/sys/sys/protosw.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)protosw.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/sys/sys/protosw.h,v 1.37 2002/03/19 20:18:41 alfred Exp $ + * $FreeBSD: src/sys/sys/protosw.h,v 1.38 2002/03/23 08:46:52 bde Exp $ */ #ifndef _SYS_PROTOSW_H_ @@ -200,12 +200,12 @@ int (*pru_accept)(struct socket *so, struct sockaddr **nam); int (*pru_attach)(struct socket *so, int proto, struct thread *td); int (*pru_bind)(struct socket *so, struct sockaddr *nam, - struct thread *td); + struct thread *td); int (*pru_connect)(struct socket *so, struct sockaddr *nam, - struct thread *td); + struct thread *td); int (*pru_connect2)(struct socket *so1, struct socket *so2); int (*pru_control)(struct socket *so, u_long cmd, caddr_t data, - struct ifnet *ifp, struct thread *td); + struct ifnet *ifp, struct thread *td); int (*pru_detach)(struct socket *so); int (*pru_disconnect)(struct socket *so); int (*pru_listen)(struct socket *so, struct thread *td); @@ -213,8 +213,8 @@ int (*pru_rcvd)(struct socket *so, int flags); int (*pru_rcvoob)(struct socket *so, struct mbuf *m, int flags); int (*pru_send)(struct socket *so, int flags, struct mbuf *m, - struct sockaddr *addr, struct mbuf *control, - struct thread *td); + struct sockaddr *addr, struct mbuf *control, + struct thread *td); #define PRUS_OOB 0x1 #define PRUS_EOF 0x2 #define PRUS_MORETOCOME 0x4 @@ -231,23 +231,21 @@ * the generic code, these just point to those routines. */ int (*pru_sosend)(struct socket *so, struct sockaddr *addr, - struct uio *uio, struct mbuf *top, - struct mbuf *control, int flags, - struct thread *td); - int (*pru_soreceive)(struct socket *so, - struct sockaddr **paddr, - struct uio *uio, struct mbuf **mp0, - struct mbuf **controlp, int *flagsp); + struct uio *uio, struct mbuf *top, struct mbuf *control, + int flags, struct thread *td); + int (*pru_soreceive)(struct socket *so, struct sockaddr **paddr, + struct uio *uio, struct mbuf **mp0, struct mbuf **controlp, + int *flagsp); int (*pru_sopoll)(struct socket *so, int events, - struct ucred *cred, struct thread *td); + struct ucred *cred, struct thread *td); }; int pru_accept_notsupp(struct socket *so, struct sockaddr **nam); int pru_connect_notsupp(struct socket *so, struct sockaddr *nam, - struct thread *td); + struct thread *td); int pru_connect2_notsupp(struct socket *so1, struct socket *so2); int pru_control_notsupp(struct socket *so, u_long cmd, caddr_t data, - struct ifnet *ifp, struct thread *td); + struct ifnet *ifp, struct thread *td); int pru_listen_notsupp(struct socket *so, struct thread *td); int pru_rcvd_notsupp(struct socket *so, int flags); int pru_rcvoob_notsupp(struct socket *so, struct mbuf *m, int flags); ==== //depot/projects/sparc64/sys/sys/socketvar.h#14 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)socketvar.h 8.3 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/socketvar.h,v 1.72 2002/03/20 04:39:32 jeff Exp $ + * $FreeBSD: src/sys/sys/socketvar.h,v 1.73 2002/03/23 08:46:52 bde Exp $ */ #ifndef _SYS_SOCKETVAR_H_ @@ -369,7 +369,7 @@ void sbinsertoob(struct sockbuf *sb, struct mbuf *m0); void sbrelease(struct sockbuf *sb, struct socket *so); int sbreserve(struct sockbuf *sb, u_long cc, struct socket *so, - struct thread *td); + struct thread *td); void sbtoxsockbuf(struct sockbuf *sb, struct xsockbuf *xsb); int sbwait(struct sockbuf *sb); int sb_lock(struct sockbuf *sb); @@ -397,8 +397,7 @@ sodropablereq(struct socket *head); struct socket * sonewconn(struct socket *head, int connstatus); -int sooptcopyin(struct sockopt *sopt, void *buf, size_t len, - size_t minlen); +int sooptcopyin(struct sockopt *sopt, void *buf, size_t len, size_t minlen); int sooptcopyout(struct sockopt *sopt, void *buf, size_t len); /* XXX; prepare mbuf for (__FreeBSD__ < 3) routines. */ @@ -407,15 +406,14 @@ int soopt_mcopyout(struct sockopt *sopt, struct mbuf *m); int sopoll(struct socket *so, int events, struct ucred *cred, - struct thread *td); -int soreceive(struct socket *so, struct sockaddr **paddr, - struct uio *uio, struct mbuf **mp0, - struct mbuf **controlp, int *flagsp); + struct thread *td); +int soreceive(struct socket *so, struct sockaddr **paddr, struct uio *uio, + struct mbuf **mp0, struct mbuf **controlp, int *flagsp); int soreserve(struct socket *so, u_long sndcc, u_long rcvcc); void sorflush(struct socket *so); int sosend(struct socket *so, struct sockaddr *addr, struct uio *uio, - struct mbuf *top, struct mbuf *control, int flags, - struct thread *td); + struct mbuf *top, struct mbuf *control, int flags, + struct thread *td); int sosetopt(struct socket *so, struct sockopt *sopt); int soshutdown(struct socket *so, int how); void sotoxsocket(struct socket *so, struct xsocket *xso); ==== //depot/projects/sparc64/sys/sys/sysent.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/sysent.h,v 1.36 2002/03/19 20:18:41 alfred Exp $ + * $FreeBSD: src/sys/sys/sysent.h,v 1.37 2002/03/23 08:46:52 bde Exp $ */ #ifndef _SYS_SYSENT_H_ @@ -68,16 +68,14 @@ /* translate trap-to-signal mapping */ int (*sv_fixup)(register_t **, struct image_params *); /* stack fixup function */ - void (*sv_sendsig)(void (*)(int), int, - struct __sigset *, u_long); - /* send signal */ + void (*sv_sendsig)(void (*)(int), int, struct __sigset *, + u_long); /* send signal */ char *sv_sigcode; /* start of sigtramp code */ int *sv_szsigcode; /* size of sigtramp code */ - void (*sv_prepsyscall)(struct trapframe *, int *, - u_int *, caddr_t *); + void (*sv_prepsyscall)(struct trapframe *, int *, u_int *, + caddr_t *); char *sv_name; /* name of binary type */ - int (*sv_coredump)(struct thread *, struct vnode *, - off_t); + int (*sv_coredump)(struct thread *, struct vnode *, off_t); /* function to dump core, or NULL */ int (*sv_imgact_try)(struct image_params *); int sv_minsigstksz; /* minimum signal stack size */ @@ -124,7 +122,7 @@ NULL, NULL); int syscall_register(int *offset, struct sysent *new_sysent, - struct sysent *old_sysent); + struct sysent *old_sysent); int syscall_deregister(int *offset, struct sysent *old_sysent); int syscall_module_handler(struct module *mod, int what, void *arg); ==== //depot/projects/sparc64/sys/sys/systm.h#19 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)systm.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sys/sys/systm.h,v 1.165 2002/03/22 19:57:41 rwatson Exp $ + * $FreeBSD: src/sys/sys/systm.h,v 1.166 2002/03/23 08:46:52 bde Exp $ */ #ifndef _SYS_SYSTM_H_ @@ -135,7 +135,7 @@ void init_param2(int physpages); void tablefull(const char *); int kvprintf(char const *, void (*)(int, void*), void *, int, - _BSD_VA_LIST_) __printflike(1, 0); + _BSD_VA_LIST_) __printflike(1, 0); void log(int, const char *, ...) __printflike(2, 3); void log_console(struct uio *); int printf(const char *, ...) __printflike(1, 2); @@ -166,9 +166,9 @@ void *memcpy(void *to, const void *from, size_t len); int copystr(const void *kfaddr, void *kdaddr, size_t len, - size_t *lencopied); + size_t *lencopied); int copyinstr(const void *udaddr, void *kaddr, size_t len, - size_t *lencopied); + size_t *lencopied); int copyin(const void *udaddr, void *kaddr, size_t len); int copyout(const void *kaddr, void *udaddr, size_t len); @@ -269,8 +269,7 @@ int rm_at_exit(exitlist_fn function); /* Fork callout list declarations. */ -typedef void (*forklist_fn)(struct proc *parent, struct proc *child, - int flags); +typedef void (*forklist_fn)(struct proc *parent, struct proc *child, int flags); int at_fork(forklist_fn function); int rm_at_fork(forklist_fn function); @@ -297,7 +296,7 @@ * less often. */ int msleep(void *chan, struct mtx *mtx, int pri, const char *wmesg, - int timo); + int timo); #define tsleep(chan, pri, wmesg, timo) msleep(chan, NULL, pri, wmesg, timo) void wakeup(void *chan); void wakeup_one(void *chan); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203231625.g2NGP9x79085>