2001-10-01 Marcus Brinkmann <marcus@gnu.org>

	* device.c (dev_error): Add a break to silence gcc warning.
	(store_device_class): Add const to type.
	* typed.c (store_typed_open_class): Likewise.
	* file.c (store_file_class): Likewise.
	* stripe.c (store_concat_class): Likewise.
	(store_ileave_class): Likewise.
	* zero.c (store_zero_class): Likewise.
	* open.c (store_open_class): Likewise.
	* remap.c (store_remap_class): Likewise.
	* task.c (store_task_class): Likewise.
	* copy.c (store_copy_class): Likewise.
	* gunzip.c (store_gunzip_class): Likewise.
	* bunzip2.c (store_bunzip2_class): Likewise.
	* mvol.c (store_mvol_class): Likewise.
	* memobj.c (store_memobj_class): Likewise.
	* nbd.c (store_nbd_class): Likewise.
	Submitted by Maurizio Boriani <baux@debian.org>.

15 files changed, 38 insertions, 15 deletions

diff --git a/libstore/ChangeLog b/libstore/ChangeLog
index 2b8f2f63..3a1ab75e 100644
--- a/libstore/ChangeLog
+++ b/libstore/ChangeLog
@@ -1,3 +1,23 @@
+2001-10-01  Marcus Brinkmann  <marcus@gnu.org>
+
+	* device.c (dev_error): Add a break to silence gcc warning.
+	(store_device_class): Add const to type.
+	* typed.c (store_typed_open_class): Likewise.
+	* file.c (store_file_class): Likewise.
+	* stripe.c (store_concat_class): Likewise.
+	(store_ileave_class): Likewise.
+	* zero.c (store_zero_class): Likewise.
+	* open.c (store_open_class): Likewise.
+	* remap.c (store_remap_class): Likewise.
+	* task.c (store_task_class): Likewise.
+	* copy.c (store_copy_class): Likewise.
+	* gunzip.c (store_gunzip_class): Likewise.
+	* bunzip2.c (store_bunzip2_class): Likewise.
+	* mvol.c (store_mvol_class): Likewise.
+	* memobj.c (store_memobj_class): Likewise.
+	* nbd.c (store_nbd_class): Likewise.
+	Submitted by Maurizio Boriani <baux@debian.org>.
+
 2001-09-30  Roland McGrath  <roland@frob.com>
 
 	* memobj.c: New file.
diff --git a/libstore/bunzip2.c b/libstore/bunzip2.c
index e1ec5808..835553c7 100644
--- a/libstore/bunzip2.c
+++ b/libstore/bunzip2.c
@@ -255,5 +255,5 @@ store_bunzip2_open (const char *name, int flags,
   return err;
 }
 
-struct store_class
+const struct store_class
 store_bunzip2_class = { -1, "bunzip2", open: store_bunzip2_open };
diff --git a/libstore/copy.c b/libstore/copy.c
index c82c0ed6..77b857ed 100644
--- a/libstore/copy.c
+++ b/libstore/copy.c
@@ -160,7 +160,7 @@ copy_clone (const struct store *from, struct store *to)
   return errno;
 }
 
-struct store_class
+const struct store_class
 store_copy_class =
 {
   STORAGE_COPY, "copy", copy_read, copy_write,
diff --git a/libstore/device.c b/libstore/device.c
index 5a18c85b..ab8d0d42 100644
--- a/libstore/device.c
+++ b/libstore/device.c
@@ -41,6 +41,7 @@ dev_error (error_t err)
     case D_INVALID_OPERATION:	return EBADF; /* ? */
     case D_NO_MEMORY:		return ENOMEM;
     default:
+      break;
     }
   /* Anything unexpected propagates up where weirdness will get noticed.  */
   return err;
@@ -223,7 +224,7 @@ dev_map (const struct store *store, vm_prot_t prot, mach_port_t *memobj)
     }
 }
 
-struct store_class
+const struct store_class
 store_device_class =
 {
   STORAGE_DEVICE, "device", dev_read, dev_write,
diff --git a/libstore/file.c b/libstore/file.c
index 8c62d85c..1e2feb40 100644
--- a/libstore/file.c
+++ b/libstore/file.c
@@ -189,7 +189,7 @@ file_map (const struct store *store, vm_prot_t prot, mach_port_t *memobj)
   return err;
 }
 
-struct store_class
+const struct store_class
 store_file_class =
 {
   STORAGE_HURD_FILE, "file", file_read, file_write,
diff --git a/libstore/gunzip.c b/libstore/gunzip.c
index 2e868219..5ebfbb7a 100644
--- a/libstore/gunzip.c
+++ b/libstore/gunzip.c
@@ -271,5 +271,5 @@ store_gunzip_open (const char *name, int flags,
   return err;
 }
 
-struct store_class
+const struct store_class
 store_gunzip_class = { -1, "gunzip", open: store_gunzip_open };
diff --git a/libstore/memobj.c b/libstore/memobj.c
index 6205b596..081c59ff 100644
--- a/libstore/memobj.c
+++ b/libstore/memobj.c
@@ -176,7 +176,8 @@ memobj_decode (struct store_enc *enc, const struct store_class *const *classes,
   return store_std_leaf_decode (enc, store_memobj_create, store);
 }
 
-struct store_class store_memobj_class =
+const struct store_class
+store_memobj_class =
 {
   STORAGE_MEMORY, "memobj",
   map: memobj_map,
diff --git a/libstore/mvol.c b/libstore/mvol.c
index f0c87f6c..ed5e0e60 100644
--- a/libstore/mvol.c
+++ b/libstore/mvol.c
@@ -78,7 +78,7 @@ mvol_remap (struct store *source,
   return store_remap_create (source, runs, num_runs, 0, store);
 }
 
-struct store_class
+const struct store_class
 store_mvol_class =
 {
   -1, "mvol", mvol_read, mvol_write,
diff --git a/libstore/nbd.c b/libstore/nbd.c
index fc815c70..13b5c3b4 100644
--- a/libstore/nbd.c
+++ b/libstore/nbd.c
@@ -357,7 +357,8 @@ nbd_clear_flags (struct store *store, int flags)
   return err;
 }
 
-struct store_class store_nbd_class =
+const struct store_class
+store_nbd_class =
 {
   STORAGE_NETWORK, "nbd",
   open: nbd_open,
diff --git a/libstore/open.c b/libstore/open.c
index ca3eb886..286b00f4 100644
--- a/libstore/open.c
+++ b/libstore/open.c
@@ -60,5 +60,5 @@ store_open (const char *name, int flags,
   return err;
 }
 
-struct store_class
+const struct store_class
 store_query_class = { -1, "query", open: store_open };
diff --git a/libstore/remap.c b/libstore/remap.c
index 34a2f1a0..140d2635 100644
--- a/libstore/remap.c
+++ b/libstore/remap.c
@@ -197,7 +197,7 @@ remap_validate_name (const char *name,
 }
 
 
-struct store_class
+const struct store_class
 store_remap_class =
 {
   STORAGE_REMAP, "remap", remap_read, remap_write,
diff --git a/libstore/stripe.c b/libstore/stripe.c
index daa0d0d3..90af39d5 100644
--- a/libstore/stripe.c
+++ b/libstore/stripe.c
@@ -102,7 +102,7 @@ ileave_decode (struct store_enc *enc, const struct store_class *const *classes,
     }
 }
 
-struct store_class
+const struct store_class
 store_ileave_class =
 {
   STORAGE_INTERLEAVE, "interleave", stripe_read, stripe_write,
@@ -145,7 +145,7 @@ concat_decode (struct store_enc *enc, const struct store_class *const *classes,
     }
 }
 
-struct store_class
+const struct store_class
 store_concat_class =
 {
   STORAGE_CONCAT, "concat", stripe_read, stripe_write,
diff --git a/libstore/task.c b/libstore/task.c
index c25af7a9..da432778 100644
--- a/libstore/task.c
+++ b/libstore/task.c
@@ -124,7 +124,7 @@ task_clear_flags (struct store *store, int flags)
   return err;
 }
 
-struct store_class
+const struct store_class
 store_task_class =
 {
   STORAGE_TASK, "task", task_read, task_write,
diff --git a/libstore/typed.c b/libstore/typed.c
index 05083eea..d3c58ba4 100644
--- a/libstore/typed.c
+++ b/libstore/typed.c
@@ -81,5 +81,5 @@ store_typed_open (const char *name, int flags,
   return (*(*cl)->open) (clname_end, flags, classes, store);
 }
 
-struct store_class
+const struct store_class
 store_typed_open_class = { -1, "typed", open: store_typed_open };
diff --git a/libstore/zero.c b/libstore/zero.c
index b69753b3..b58bac6f 100644
--- a/libstore/zero.c
+++ b/libstore/zero.c
@@ -170,7 +170,7 @@ zero_map (const struct store *store, vm_prot_t prot, mach_port_t *memobj)
   return 0;
 }
 
-struct store_class
+const struct store_class
 store_zero_class =
 {
   STORAGE_ZERO, "zero", zero_read, zero_write,