From 175389cff2201de51f3743cf4029a77359e55dc4 Mon Sep 17 00:00:00 2001 From: Edward Tomasz Napierala Date: Thu, 22 Jul 2010 05:42:29 +0000 Subject: [PATCH] Remove spurious '/*-' marks and fix some other style problems. Submitted by: bde@ --- sys/kern/init_main.c | 7 +++--- sys/kern/uipc_usrreq.c | 2 +- sys/sys/disk.h | 54 +++++++++++++++++++++--------------------- sys/sys/kthread.h | 2 +- sys/sys/signal.h | 2 +- sys/sys/types.h | 4 +++- 6 files changed, 36 insertions(+), 35 deletions(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index d608e25e172e..e4d84196b45e 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -539,10 +539,9 @@ proc0_init(void *dummy __unused) vm_map_init(&vmspace0.vm_map, vmspace_pmap(&vmspace0), p->p_sysent->sv_minuser, p->p_sysent->sv_maxuser); - /*- - * call the init and ctor for the new thread and proc - * we wait to do this until all other structures - * are fairly sane. + /* + * Call the init and ctor for the new thread and proc. We wait + * to do this until all other structures are fairly sane. */ EVENTHANDLER_INVOKE(process_init, p); EVENTHANDLER_INVOKE(thread_init, td); diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index fdf3d902509f..63437bcb1b5e 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -165,7 +165,7 @@ SYSCTL_ULONG(_net_local_seqpacket, OID_AUTO, recvspace, CTLFLAG_RW, SYSCTL_INT(_net_local, OID_AUTO, inflight, CTLFLAG_RD, &unp_rights, 0, "File descriptors in flight."); -/*- +/* * Locking and synchronization: * * Three types of locks exit in the local domain socket implementation: a diff --git a/sys/sys/disk.h b/sys/sys/disk.h index 422229ef69c8..ba25c89bfa84 100644 --- a/sys/sys/disk.h +++ b/sys/sys/disk.h @@ -25,41 +25,41 @@ void disk_err(struct bio *bp, const char *what, int blkdone, int nl); #endif -#define DIOCGSECTORSIZE _IOR('d', 128, u_int) - /*- - * Get the sectorsize of the device in bytes. The sectorsize is the - * smallest unit of data which can be transfered from this device. - * Usually this is a power of two but it may not be. (ie: CDROM audio) +#define DIOCGSECTORSIZE _IOR('d', 128, u_int) + /* + * Get the sector size of the device in bytes. The sector size is the + * smallest unit of data which can be transferred from this device. + * Usually this is a power of 2 but it might not be (i.e. CDROM audio). */ -#define DIOCGMEDIASIZE _IOR('d', 129, off_t) /* Get media size in bytes */ - /*- +#define DIOCGMEDIASIZE _IOR('d', 129, off_t) /* Get media size in bytes */ + /* * Get the size of the entire device in bytes. This should be a - * multiple of the sectorsize. + * multiple of the sector size. */ -#define DIOCGFWSECTORS _IOR('d', 130, u_int) /* Get firmware sectorcount */ - /*- - * Get the firmwares notion of number of sectors per track. This +#define DIOCGFWSECTORS _IOR('d', 130, u_int) /* Get firmware's sectorcount */ + /* + * Get the firmware's notion of number of sectors per track. This * value is mostly used for compatibility with various ill designed * disk label formats. Don't use it unless you have to. */ -#define DIOCGFWHEADS _IOR('d', 131, u_int) /* Get firmware headcount */ - /*- +#define DIOCGFWHEADS _IOR('d', 131, u_int) /* Get firmware's headcount */ + /* * Get the firmwares notion of number of heads per cylinder. This * value is mostly used for compatibility with various ill designed * disk label formats. Don't use it unless you have to. */ -#define DIOCSKERNELDUMP _IOW('d', 133, u_int) /* Set/Clear kernel dumps */ - /*- +#define DIOCSKERNELDUMP _IOW('d', 133, u_int) /* Set/Clear kernel dumps */ + /* * Enable/Disable (the argument is boolean) the device for kernel * core dumps. */ -#define DIOCGFRONTSTUFF _IOR('d', 134, off_t) - /*- +#define DIOCGFRONTSTUFF _IOR('d', 134, off_t) + /* * Many disk formats have some amount of space reserved at the * start of the disk to hold bootblocks, various disklabels and * similar stuff. This ioctl returns the number of such bytes @@ -67,12 +67,12 @@ void disk_err(struct bio *bp, const char *what, int blkdone, int nl); */ #define DIOCGFLUSH _IO('d', 135) /* Flush write cache */ - /*- + /* * Flush write cache of the device. */ #define DIOCGDELETE _IOW('d', 136, off_t[2]) /* Delete data */ - /*- + /* * Mark data on the device as unused. */ @@ -98,22 +98,22 @@ void disk_err(struct bio *bp, const char *what, int blkdone, int nl); * - ident is optional and applications can't relay on its presence. */ -#define DIOCGPROVIDERNAME _IOR('d', 138, char[MAXPATHLEN]) - /*- +#define DIOCGPROVIDERNAME _IOR('d', 138, char[MAXPATHLEN]) + /* * Store the provider name, given a device path, in a buffer. The buffer * must be at least MAXPATHLEN bytes long. */ -#define DIOCGSTRIPESIZE _IOR('d', 139, off_t) /* Get stripe size in bytes */ - /*- +#define DIOCGSTRIPESIZE _IOR('d', 139, off_t) /* Get stripe size in bytes */ + /* * Get the size of the device's optimal access block in bytes. - * This should be a multiple of the sectorsize. + * This should be a multiple of the sector size. */ -#define DIOCGSTRIPEOFFSET _IOR('d', 140, off_t) /* Get stripe offset in bytes */ - /*- +#define DIOCGSTRIPEOFFSET _IOR('d', 140, off_t) /* Get stripe offset in bytes */ + /* * Get the offset of the first device's optimal access block in bytes. - * This should be a multiple of the sectorsize. + * This should be a multiple of the sector size. */ #endif /* _SYS_DISK_H_ */ diff --git a/sys/sys/kthread.h b/sys/sys/kthread.h index 77e1af021839..4911ecccfe95 100644 --- a/sys/sys/kthread.h +++ b/sys/sys/kthread.h @@ -31,7 +31,7 @@ #include -/*- +/* * A kernel process descriptor; used to start "internal" daemons. * * Note: global_procpp may be NULL for no global save area. diff --git a/sys/sys/signal.h b/sys/sys/signal.h index ff2d1fcbed29..a7ca96e37d29 100644 --- a/sys/sys/signal.h +++ b/sys/sys/signal.h @@ -122,7 +122,7 @@ /* #define SIG_CATCH ((__sighandler_t *)2) See signalvar.h */ #define SIG_HOLD ((__sighandler_t *)3) -/*- +/* * Type of a signal handling function. * * Language spec sez signal handlers take exactly one arg, even though we diff --git a/sys/sys/types.h b/sys/sys/types.h index 6696de670917..c747d166e81d 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -287,12 +287,14 @@ typedef int boolean_t; typedef struct device *device_t; typedef __intfptr_t intfptr_t; -/*- +/* * XXX this is fixed width for historical reasons. It should have had type * __int_fast32_t. Fixed-width types should not be used unless binary * compatibility is essential. Least-width types should be used even less * since they provide smaller benefits. + * * XXX should be MD. + * * XXX this is bogus in -current, but still used for spl*(). */ typedef __uint32_t intrmask_t; /* Interrupt mask (spl, xxx_imask...) */