/* -> /*- for copyright notices, minor format tweaks as necessary

15 files changed, 29 insertions, 20 deletions

diff --git a/sys/geom/bde/g_bde_crypt.c b/sys/geom/bde/g_bde_crypt.c
index 165dad6..e95352e 100644
--- a/sys/geom/bde/g_bde_crypt.c
+++ b/sys/geom/bde/g_bde_crypt.c
@@ -30,8 +30,8 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD$
- *
- * This source file contains the functions responsible for the crypto, keying
+ */
+/* This source file contains the functions responsible for the crypto, keying
  * and mapping operations on the I/O requests.
  *
  */
diff --git a/sys/geom/bde/g_bde_lock.c b/sys/geom/bde/g_bde_lock.c
index fd0d9ee..a33144c 100644
--- a/sys/geom/bde/g_bde_lock.c
+++ b/sys/geom/bde/g_bde_lock.c
@@ -30,8 +30,8 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD$
- *
- * This souce file contains routines which operates on the lock sectors, both
+ */
+/* This souce file contains routines which operates on the lock sectors, both
  * for the kernel and the userland program gbde(1).
  *
  */
diff --git a/sys/geom/bde/g_bde_work.c b/sys/geom/bde/g_bde_work.c
index f2baef5..8e1b542 100644
--- a/sys/geom/bde/g_bde_work.c
+++ b/sys/geom/bde/g_bde_work.c
@@ -30,7 +30,8 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD$
- *
+ */
+/*
  * This source file contains the state-engine which makes things happen in the
  * right order.
  *
diff --git a/sys/geom/geom_aes.c b/sys/geom/geom_aes.c
index db073d4..9d17fa9 100644
--- a/sys/geom/geom_aes.c
+++ b/sys/geom/geom_aes.c
@@ -31,7 +31,9 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
+ */
+
+/*
  * This method provides AES encryption with a compiled in key (default
  * all zeroes).
  *
diff --git a/sys/geom/geom_bsd.c b/sys/geom/geom_bsd.c
index eaddb98..e4834a3 100644
--- a/sys/geom/geom_bsd.c
+++ b/sys/geom/geom_bsd.c
@@ -31,7 +31,9 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
+ */
+
+/*
  * This is the method for dealing with BSD disklabels.  It has been
  * extensively (by my standards at least) commented, in the vain hope that
  * it will serve as the source in future copy&paste operations.
diff --git a/sys/geom/geom_bsd_enc.c b/sys/geom/geom_bsd_enc.c
index dfdeb85..a526cac 100644
--- a/sys/geom/geom_bsd_enc.c
+++ b/sys/geom/geom_bsd_enc.c
@@ -31,7 +31,9 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
+ */
+
+/*
  * Functions to encode and decode struct disklabel and struct partition into
  * a bytestream of little endianess and correct packing.
  *
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c
index c638a3b..bfa125d 100644
--- a/sys/geom/geom_ccd.c
+++ b/sys/geom/geom_ccd.c
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2003 Poul-Henning Kamp.
  * Copyright (c) 1995 Jason R. Thorpe.
  * Copyright (c) 1990, 1993
diff --git a/sys/geom/geom_fox.c b/sys/geom/geom_fox.c
index 76255e2..2eef7cd 100644
--- a/sys/geom/geom_fox.c
+++ b/sys/geom/geom_fox.c
@@ -27,8 +27,9 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD$
- *
- * This is a GEOM module for handling path selection for multi-path
+ */
+
+/* This is a GEOM module for handling path selection for multi-path
  * storage devices.  It is named "fox" because it, like they, prefer
  * to have multiple exits to choose from.
  *
diff --git a/sys/geom/geom_mbr_enc.c b/sys/geom/geom_mbr_enc.c
index da5f997..e3e3977 100644
--- a/sys/geom/geom_mbr_enc.c
+++ b/sys/geom/geom_mbr_enc.c
@@ -22,8 +22,9 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * Functions to encode or decode struct dos_partition into a bytestream
+ */
+
+/* Functions to encode or decode struct dos_partition into a bytestream
  * of correct endianess and packing.  These functions do no validation
  * or sanity checking, they only pack/unpack the fields correctly.
  *
diff --git a/sys/geom/geom_sunlabel_enc.c b/sys/geom/geom_sunlabel_enc.c
index 70899b1..eaca292 100644
--- a/sys/geom/geom_sunlabel_enc.c
+++ b/sys/geom/geom_sunlabel_enc.c
@@ -24,8 +24,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * Functions to encode or decode struct sun_disklabel into a bytestream
+ */
+/* Functions to encode or decode struct sun_disklabel into a bytestream
  * of correct endianess and packing.
  *
  * NB!  This file must be usable both in kernel and userland.
diff --git a/sys/geom/vinum/geom_vinum.c b/sys/geom/vinum/geom_vinum.c
index 7b5b456..252b48f 100644
--- a/sys/geom/vinum/geom_vinum.c
+++ b/sys/geom/vinum/geom_vinum.c
@@ -1,4 +1,4 @@
-/*
+/*-
  *  Copyright (c) 2004 Lukas Ertl
  *  All rights reserved.
  * 
diff --git a/sys/geom/vinum/geom_vinum_list.c b/sys/geom/vinum/geom_vinum_list.c
index ca95ba7..cb4ccfa 100644
--- a/sys/geom/vinum/geom_vinum_list.c
+++ b/sys/geom/vinum/geom_vinum_list.c
@@ -1,4 +1,4 @@
-/*
+/*-
  *  Copyright (c) 2004 Lukas Ertl
  *  All rights reserved.
  * 
diff --git a/sys/geom/vinum/geom_vinum_raid5.h b/sys/geom/vinum/geom_vinum_raid5.h
index 9637db1..747307d 100644
--- a/sys/geom/vinum/geom_vinum_raid5.h
+++ b/sys/geom/vinum/geom_vinum_raid5.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2004 Lukas Ertl
  * All rights reserved.
  *
diff --git a/sys/geom/vinum/geom_vinum_rm.c b/sys/geom/vinum/geom_vinum_rm.c
index d328c50..f4c191a 100644
--- a/sys/geom/vinum/geom_vinum_rm.c
+++ b/sys/geom/vinum/geom_vinum_rm.c
@@ -1,4 +1,4 @@
-/*
+/*-
  *  Copyright (c) 2004 Lukas Ertl
  *  All rights reserved.
  * 
diff --git a/sys/geom/vinum/geom_vinum_var.h b/sys/geom/vinum/geom_vinum_var.h
index 05a5e8c..6b21326 100644
--- a/sys/geom/vinum/geom_vinum_var.h
+++ b/sys/geom/vinum/geom_vinum_var.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2004 Lukas Ertl
  * Copyright (c) 1997, 1998, 1999
  *      Nan Yang Computer Services Limited.  All rights reserved.