librbd, librados: cleanup

diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h
index e185fa69f224cf9d67b3440c42e15d4a402f295c..f73afd9c5a4cd5c33224d3d2f2d9ecdf2eac2b60 100644 (file)
--- a/src/include/rados/librados.h
+++ b/src/include/rados/librados.h
@@ -27,7 +27,7 @@ extern "C" {
 
 /* initialization */
 int rados_initialize(int argc, const char **argv); /* arguments are optional */
-void rados_deinitialize();
+void rados_deinitialize(void);
 
 void librados_version(int *major, int *minor, int *extra);
 

diff --git a/src/include/rbd/librbd.h b/src/include/rbd/librbd.h
index 0a3afbb47a4872f14b8aaaf458f7fdfa97694341..228dd75a5355c6fa7b814e11d02620d44d32f5d4 100644 (file)
--- a/src/include/rbd/librbd.h
+++ b/src/include/rbd/librbd.h
@@ -53,7 +53,7 @@ typedef struct {
 
 /* initialization */
 int rbd_initialize(int argc, const char **argv); /* arguments are optional */
-void rbd_shutdown();
+void rbd_shutdown(void);
 
 void librbd_version(int *major, int *minor, int *extra);
 

diff --git a/src/rbd.cc b/src/rbd.cc
index e796cf63484169475379663f3381a14108036af1..c486ec93d924640d4932685cf9d6c0861419813c 100644 (file)
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -81,32 +81,6 @@ void usage_exit()
   exit(1);
 }
 
-static void init_rbd_header(struct rbd_obj_header_ondisk& ondisk,
-                           size_t size, int *order, uint64_t bid)
-{
-  uint32_t hi = bid >> 32;
-  uint32_t lo = bid & 0xFFFFFFFF;
-  memset(&ondisk, 0, sizeof(ondisk));
-
-  memcpy(&ondisk.text, RBD_HEADER_TEXT, sizeof(RBD_HEADER_TEXT));
-  memcpy(&ondisk.signature, RBD_HEADER_SIGNATURE, sizeof(RBD_HEADER_SIGNATURE));
-  memcpy(&ondisk.version, RBD_HEADER_VERSION, sizeof(RBD_HEADER_VERSION));
-
-  snprintf(ondisk.block_name, sizeof(ondisk.block_name), "rb.%x.%x", hi, lo);
-
-  if (!*order)
-    *order = RBD_DEFAULT_OBJ_ORDER;
-
-  ondisk.image_size = size;
-  ondisk.options.order = *order;
-  ondisk.options.crypt_type = RBD_CRYPT_NONE;
-  ondisk.options.comp_type = RBD_COMP_NONE;
-  ondisk.snap_seq = 0;
-  ondisk.snap_count = 0;
-  ondisk.reserved = 0;
-  ondisk.snap_names_len = 0;
-}
-
 static void print_info(const char *imgname, librbd::image_info_t& info)
 {
   cout << "rbd image '" << imgname << "':\n"