cleaned up char* vs const char*

diff --git a/src/cfuse.cc b/src/cfuse.cc
index 3c157fefadf8977178d82d71b2bafb922685ee20..fc2ab0fd2f591fe244eee137eb9bc9c828e6489f 100644 (file)
--- a/src/cfuse.cc
+++ b/src/cfuse.cc
@@ -35,10 +35,10 @@ using namespace std;
 #include <sys/stat.h>
 #include <fcntl.h>
 
-int main(int argc, char **argv, char *envp[]) {
+int main(int argc, const char **argv, const char *envp[]) {
 
   //cerr << "cfuse starting " << myrank << "/" << world << std::endl;
-  vector<char*> args;
+  vector<const char*> args;
   argv_to_vec(argc, argv, args);
   parse_config_options(args);
 

diff --git a/src/client/SyntheticClient.cc b/src/client/SyntheticClient.cc
index c46b1f9d6a568dbe17fea30656c20029682c0817..f6f70825212e16019767e0a5f47cbaeea1a95838 100644 (file)
--- a/src/client/SyntheticClient.cc
+++ b/src/client/SyntheticClient.cc
@@ -47,9 +47,9 @@ list<int> syn_modes;
 list<int> syn_iargs;
 list<string> syn_sargs;
 
-void parse_syn_options(vector<char*>& args)
+void parse_syn_options(vector<const char*>& args)
 {
-  vector<char*> nargs;
+  vector<const char*> nargs;
 
   for (unsigned i=0; i<args.size(); i++) {
     if (strcmp(args[i],"--syn") == 0) {

diff --git a/src/client/SyntheticClient.h b/src/client/SyntheticClient.h
index 401da33316900799df969569b5ab14eb5eea3134..823ab80c42d297757698abc82a500de90f0a2b67 100644 (file)
--- a/src/client/SyntheticClient.h
+++ b/src/client/SyntheticClient.h
@@ -77,7 +77,7 @@
 
 
 
-void parse_syn_options(vector<char*>& args);
+void parse_syn_options(vector<const char*>& args);
 
 class SyntheticClient {
   Client *client;
@@ -142,7 +142,7 @@ class SyntheticClient {
   
   filepath sub;
   char sub_s[50];
-  const char *make_sub(char *base) {
+  const char *make_sub(const char *base) {
     sprintf(sub_s, "%s.%d", base, rand() % 100);
     string f = sub_s;
     sub = cwd;

diff --git a/src/client/fuse.cc b/src/client/fuse.cc
index 64198dc41df51ff92e98815a00777a7137de7815..10d7c24bf8d771777cc4d93cdef6bef5e4f0a034 100644 (file)
--- a/src/client/fuse.cc
+++ b/src/client/fuse.cc
@@ -258,14 +258,14 @@ static struct fuse_operations ceph_oper = {
 };
 
 
-int ceph_fuse_main(Client *c, int argc, char *argv[])
+int ceph_fuse_main(Client *c, int argc, const char *argv[])
 {
   // init client
   client = c;
 
   // set up fuse argc/argv
   int newargc = 0;
-  char **newargv = (char **) malloc((argc + 10) * sizeof(char *));
+  const char **newargv = (const char **) malloc((argc + 10) * sizeof(char *));
   newargv[newargc++] = argv[0];
   
   // allow other (all!) users to see my file system
@@ -301,6 +301,6 @@ int ceph_fuse_main(Client *c, int argc, char *argv[])
   
   // go fuse go
   cout << "ok, calling fuse_main" << std::endl;
-  int r = fuse_main(newargc, newargv, &ceph_oper, 0);
+  int r = fuse_main(newargc, (char**)newargv, &ceph_oper, 0);
   return r;
 }

diff --git a/src/client/fuse.h b/src/client/fuse.h
index dfacbaa4fdd85e5605b3fbd0f38782d9a012a033..f906f78abd5c2deca0a65479011aa7c651656a21 100644 (file)
--- a/src/client/fuse.h
+++ b/src/client/fuse.h
@@ -21,4 +21,4 @@
  *   we will put fuse in the foreground so that it
  *   won't fork and we can see stdout.
  */
-int ceph_fuse_main(Client *cl, int argc, char *argv[]);
+int ceph_fuse_main(Client *cl, int argc, const char *argv[]);

diff --git a/src/client/fuse_ll.cc b/src/client/fuse_ll.cc
index f1f92b0cd01b3054f025daa20209685ea2400df1..79c99859c6b9414e6ec88fd1cd51816113287a02 100644 (file)
--- a/src/client/fuse_ll.cc
+++ b/src/client/fuse_ll.cc
@@ -348,7 +348,7 @@ static struct fuse_lowlevel_ops ceph_ll_oper = {
  bmap: 0
 };
 
-int ceph_fuse_ll_main(Client *c, int argc, char *argv[])
+int ceph_fuse_ll_main(Client *c, int argc, const char *argv[])
 {
   cout << "ceph_fuse_ll_main starting fuse on pid " << getpid() << std::endl;
 
@@ -356,7 +356,7 @@ int ceph_fuse_ll_main(Client *c, int argc, char *argv[])
 
   // set up fuse argc/argv
   int newargc = 0;
-  char **newargv = (char **) malloc((argc + 10) * sizeof(char *));
+  const char **newargv = (const char **) malloc((argc + 10) * sizeof(char *));
   newargv[newargc++] = argv[0];
   newargv[newargc++] = "-f";  // stay in foreground
 
@@ -366,7 +366,7 @@ int ceph_fuse_ll_main(Client *c, int argc, char *argv[])
   for (int argctr = 1; argctr < argc; argctr++) newargv[newargc++] = argv[argctr];
 
   // go go gadget fuse
-  struct fuse_args args = FUSE_ARGS_INIT(newargc, newargv);
+  struct fuse_args args = FUSE_ARGS_INIT(newargc, (char**)newargv);
   struct fuse_chan *ch;
   char *mountpoint;
   int err = -1;

diff --git a/src/client/fuse_ll.h b/src/client/fuse_ll.h
index 068969c4f7487285cc027c445a7b87d0e2ac544b..f6489c8c6518b75863e24c1bc7243ecb73e86a1a 100644 (file)
--- a/src/client/fuse_ll.h
+++ b/src/client/fuse_ll.h
@@ -12,4 +12,4 @@
  * 
  */
 
-int ceph_fuse_ll_main(Client *c, int argc, char *argv[]);
+int ceph_fuse_ll_main(Client *c, int argc, const char *argv[]);

diff --git a/src/cmds.cc b/src/cmds.cc
index 6e475ad4b588d72eaab23d51438bf8b6de9dbad7..89121652431f25cca0aae9dec5b69b3963e0520c 100644 (file)
--- a/src/cmds.cc
+++ b/src/cmds.cc
@@ -49,9 +49,9 @@ class C_Debug : public Context {
 };
 
 
-int main(int argc, char **argv) 
+int main(int argc, const char **argv) 
 {
-  vector<char*> args;
+  vector<const char*> args;
   argv_to_vec(argc, argv, args);
 
   parse_config_options(args);

diff --git a/src/cmon.cc b/src/cmon.cc
index 0adac2ab5cec58565c8b85c6f7ee799ec388878d..dc06db78704797783872b4f01fc2af1691033da9 100644 (file)
--- a/src/cmon.cc
+++ b/src/cmon.cc
@@ -49,9 +49,9 @@ class C_Debug : public Context {
 };
 
 
-int main(int argc, char **argv) 
+int main(int argc, const char **argv) 
 {
-  vector<char*> args;
+  vector<const char*> args;
   argv_to_vec(argc, argv, args);
 
   parse_config_options(args);
@@ -63,7 +63,7 @@ int main(int argc, char **argv)
 
   // args
   int whoami = -1;
-  char *monmap_fn = ".ceph_monmap";
+  const char *monmap_fn = ".ceph_monmap";
   for (unsigned i=0; i<args.size(); i++) {
     if (strcmp(args[i], "--mon") == 0) 
       whoami = atoi(args[++i]);

diff --git a/src/cmonctl.cc b/src/cmonctl.cc
index 85f4e1dc49392a5b8f1083ef8fb36d5669b866d9..863bcbb697ffe5c3280b0f714ada544da590392c 100644 (file)
--- a/src/cmonctl.cc
+++ b/src/cmonctl.cc
@@ -50,9 +50,9 @@ class Admin : public Dispatcher {
   }
 } dispatcher;
 
-int main(int argc, char **argv, char *envp[]) {
+int main(int argc, const char **argv, const char *envp[]) {
 
-  vector<char*> args;
+  vector<const char*> args;
   argv_to_vec(argc, argv, args);
   parse_config_options(args);
 

diff --git a/src/config.cc b/src/config.cc
index 04e92fb46bbfce508be8962dcb868f5011aa8833..6ae5554b7a2bb690341c8e6be0d425c07c4b1c7e 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -399,7 +399,7 @@ md_config_t g_conf = {
 #include <string.h>
 
 
-void env_to_vec(std::vector<char*>& args) 
+void env_to_vec(std::vector<const char*>& args) 
 {
   const char *p = getenv("CEPH_ARGS");
   if (!p) return;
@@ -424,17 +424,17 @@ void env_to_vec(std::vector<char*>& args)
 }
 
 
-void argv_to_vec(int argc, char **argv,
-                 std::vector<char*>& args)
+void argv_to_vec(int argc, const char **argv,
+                 std::vector<const char*>& args)
 {
   for (int i=1; i<argc; i++)
     args.push_back(argv[i]);
 }
 
-void vec_to_argv(std::vector<char*>& args,
-                 int& argc, char **&argv)
+void vec_to_argv(std::vector<const char*>& args,
+                 int& argc, const char **&argv)
 {
-  argv = (char**)malloc(sizeof(char*) * argc);
+  argv = (const char**)malloc(sizeof(char*) * argc);
   argc = 1;
   argv[0] = "asdf";
 
@@ -486,9 +486,9 @@ bool parse_ip_port(const char *s, entity_addr_t& a)
 
 
 
-void parse_config_options(std::vector<char*>& args)
+void parse_config_options(std::vector<const char*>& args)
 {
-  std::vector<char*> nargs;
+  std::vector<const char*> nargs;
 
   for (unsigned i=0; i<args.size(); i++) {
     if (strcmp(args[i],"--bind") == 0) 

diff --git a/src/config.h b/src/config.h
index 1fe7dc67cc9780fafff9491356fd17203a01940b..4da9c04a3390359eb64e1a2d2f7b60a799122df1 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -48,14 +48,14 @@ struct md_config_t {
   // profiling
   bool  log;
   int   log_interval;
-  char *log_name;
+  const char *log_name;
 
   bool log_messages;
   bool log_pins;
 
   bool logger_calc_variance;
 
-  char *dout_dir;
+  const char *dout_dir;
 
   bool fake_clock;
   bool fakemessenger_serialize;
@@ -112,7 +112,7 @@ struct md_config_t {
   bool tcp_multi_dispatch;
   */
 
-  char *ms_hosts;
+  const char *ms_hosts;
   bool ms_tcp_nodelay;
   double ms_retry_interval;
   double ms_fail_interval;
@@ -162,7 +162,7 @@ struct md_config_t {
   size_t   client_bcache_align;
   */
 
-  char *client_trace;
+  const char *client_trace;
   int      fuse_direct_io;
   bool fuse_ll;
 
@@ -285,8 +285,8 @@ struct md_config_t {
   int   fakestore_syncthreads;   // such crap
   bool  fakestore_fake_attrs;
   bool  fakestore_fake_collections;
-  char  *fakestore_dev;
-
+  const char  *fakestore_dev;
+  
   // ebofs
   int   ebofs;
   bool  ebofs_cloneable;
@@ -363,13 +363,13 @@ extern md_config_t g_debug_after_conf;
 /**
  * command line / environment argument parsing
  */
-void env_to_vec(std::vector<char*>& args);
-void argv_to_vec(int argc, char **argv,
-                 std::vector<char*>& args);
-void vec_to_argv(std::vector<char*>& args,
-                 int& argc, char **&argv);
+void env_to_vec(std::vector<const char*>& args);
+void argv_to_vec(int argc, const char **argv,
+                 std::vector<const char*>& args);
+void vec_to_argv(std::vector<const char*>& args,
+                 int& argc, const char **&argv);
 
-void parse_config_options(std::vector<char*>& args);
+void parse_config_options(std::vector<const char*>& args);
 
 extern bool parse_ip_port(const char *s, entity_addr_t& addr);
 

diff --git a/src/cosd.cc b/src/cosd.cc
index e575c72836e698a690f531dcfe83632444571530..5b773cd749be5f29e6beeee896b1d022f3ac7d20 100644 (file)
--- a/src/cosd.cc
+++ b/src/cosd.cc
@@ -51,9 +51,9 @@ class C_Debug : public Context {
 };
 
 
-int main(int argc, char **argv) 
+int main(int argc, const char **argv) 
 {
-  vector<char*> args;
+  vector<const char*> args;
   argv_to_vec(argc, argv, args);
 
   parse_config_options(args);
@@ -66,7 +66,7 @@ int main(int argc, char **argv)
   if (g_conf.clock_tare) g_clock.tare();
 
   // osd specific args
-  char *dev = 0;
+  const char *dev = 0;
   char dev_default[20];
   int whoami = -1;
   for (unsigned i=0; i<args.size(); i++) {

diff --git a/src/csyn.cc b/src/csyn.cc
index 562f00e3f861b7a4cb19d0e7568126af9e5003e3..38284cc444903105dfbffed5a224d0356adf352f 100644 (file)
--- a/src/csyn.cc
+++ b/src/csyn.cc
@@ -21,7 +21,6 @@ using namespace std;
 
 #include "client/SyntheticClient.h"
 #include "client/Client.h"
-#include "client/fuse.h"
 
 #include "msg/SimpleMessenger.h"
 
@@ -35,15 +34,14 @@ using namespace std;
 #include <sys/stat.h>
 #include <fcntl.h>
 
-int main(int argc, char **argv, char *envp[]) {
+int main(int argc, const char **argv, char *envp[]) {
 
-  //cerr << "cfuse starting " << myrank << "/" << world << std::endl;
-  vector<char*> args;
+  //cerr << "csyn starting" << std::endl;
+  vector<const char*> args;
   argv_to_vec(argc, argv, args);
   parse_config_options(args);
   parse_syn_options(args);   // for SyntheticClient
 
-  // args for fuse
   vec_to_argv(args, argc, argv);
 
   if (g_conf.clock_tare) g_clock.tare();

diff --git a/src/dupstore.cc b/src/dupstore.cc
index 0b3b6fa6eb8c228cc20c182ecbe1d0d4f663bb82..e670b660156acaace8132cd37f6ee329b24bae43 100644 (file)
--- a/src/dupstore.cc
+++ b/src/dupstore.cc
@@ -74,9 +74,9 @@ void usage()
   exit(0);
 }
 
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
 {
-  vector<char*> args;
+  vector<const char*> args;
   argv_to_vec(argc, argv, args);
   parse_config_options(args);
 

diff --git a/src/ebofs/BlockDevice.h b/src/ebofs/BlockDevice.h
index 78d7c2b54b3ca4fd8cc52f483076478eb8fd1904..6c35c1ccff68bb3770b30038eff797cb4ad26b2e 100644 (file)
--- a/src/ebofs/BlockDevice.h
+++ b/src/ebofs/BlockDevice.h
@@ -64,14 +64,14 @@ class BlockDevice {
     callback *cb;
     Cond *cond;
     int rval;
-    char *note;
+    const char *note;
     bool done;
 
     Queue *in_queue;
 
-    biovec(char t, block_t s, block_t l, bufferlist& b, callback *c, char *n=0) :
+    biovec(char t, block_t s, block_t l, bufferlist& b, callback *c, const char *n=0) :
       type(t), start(s), length(l), bl(b), cb(c), cond(0), rval(0), note(n), done(false), in_queue(0) {}
-    biovec(char t, block_t s, block_t l, bufferlist& b, Cond *c, char *n=0) :
+    biovec(char t, block_t s, block_t l, bufferlist& b, Cond *c, const char *n=0) :
       type(t), start(s), length(l), bl(b), cb(0), cond(c), rval(0), note(n), done(false), in_queue(0) {}
   };
   friend ostream& operator<<(ostream& out, biovec &bio);
@@ -290,12 +290,12 @@ class BlockDevice {
   // ** blocking interface **
 
   // read
-  int read(block_t bno, unsigned num, bufferptr& bptr, char *n=0) {
+  int read(block_t bno, unsigned num, bufferptr& bptr, const char *n=0) {
     bufferlist bl;
     bl.push_back(bptr);
     return read(bno, num, bl, n);
   }
-  int read(block_t bno, unsigned num, bufferlist& bl, char *n=0) {
+  int read(block_t bno, unsigned num, bufferlist& bl, const char *n=0) {
     Cond c;
     biovec bio(biovec::IO_READ, bno, num, bl, &c, n);
     
@@ -309,12 +309,12 @@ class BlockDevice {
   }
 
   // write
-  int write(unsigned bno, unsigned num, bufferptr& bptr, char *n=0) {
+  int write(unsigned bno, unsigned num, bufferptr& bptr, const char *n=0) {
     bufferlist bl;
     bl.push_back(bptr);
     return write(bno, num, bl, n);
   }
-  int write(unsigned bno, unsigned num, bufferlist& bl, char *n=0) {
+  int write(unsigned bno, unsigned num, bufferlist& bl, const char *n=0) {
     Cond c;
     biovec bio(biovec::IO_WRITE, bno, num, bl, &c, n);
 
@@ -328,14 +328,14 @@ class BlockDevice {
   }
 
   // ** non-blocking interface **
-  ioh_t read(block_t bno, unsigned num, bufferlist& bl, callback *fin, char *n=0) {
+  ioh_t read(block_t bno, unsigned num, bufferlist& bl, callback *fin, const char *n=0) {
     biovec *pbio = new biovec(biovec::IO_READ, bno, num, bl, fin, n);
     lock.Lock();
     _submit_io(pbio);
     lock.Unlock();
     return (ioh_t)pbio;
   }
-  ioh_t write(block_t bno, unsigned num, bufferlist& bl, callback *fin, char *n=0) {
+  ioh_t write(block_t bno, unsigned num, bufferlist& bl, callback *fin, const char *n=0) {
     biovec *pbio = new biovec(biovec::IO_WRITE, bno, num, bl, fin, n);
     lock.Lock();
     _submit_io(pbio);

diff --git a/src/ebofs/Ebofs.h b/src/ebofs/Ebofs.h
index e822f5a3263f5648e85a7b4bedefff7498f49204..b0ba503f65ed1fa7efb7107993d8c37a86a7383b 100644 (file)
--- a/src/ebofs/Ebofs.h
+++ b/src/ebofs/Ebofs.h
@@ -239,7 +239,7 @@ protected:
 
 
  public:
-  Ebofs(char *devfn, char *jfn=0) : 
+  Ebofs(const char *devfn, char *jfn=0) : 
     fake_writes(false),
     dev(devfn), 
     mounted(false), unmounting(false), dirty(false), readonly(false), 

diff --git a/src/fakefuse.cc b/src/fakefuse.cc
index 4f058bd17fc29d471c19789eae5dd39ed49ad432..69c49a9264e80ef914c195a47745b3049ca812e1 100644 (file)
--- a/src/fakefuse.cc
+++ b/src/fakefuse.cc
@@ -57,14 +57,14 @@ public:
 
 
 
-int main(int argc, char **argv) {
+int main(int argc, const char **argv) {
   cerr << "fakefuse starting" << std::endl;
 
   // stop on our own (by default)
   g_conf.mon_stop_on_last_unmount = true;
   g_conf.mon_stop_with_last_mds = true;
 
-  vector<char*> args;
+  vector<const char*> args;
   argv_to_vec(argc, argv, args);
   parse_config_options(args);
 
@@ -74,7 +74,7 @@ int main(int argc, char **argv) {
   //g_timer.add_event_after(5.0, new C_Test2);
   //g_timer.add_event_after(10.0, new C_Test);
 
-  vector<char*> nargs;
+  vector<const char*> nargs;
   for (unsigned i=0; i<args.size(); i++) {
     nargs.push_back(args[i]);
   }

diff --git a/src/fakesyn.cc b/src/fakesyn.cc
index 1d28140986195f5e42fda3a8956265e492ad128c..b474e4008530f3eead199e152091beaf69a19281 100644 (file)
--- a/src/fakesyn.cc
+++ b/src/fakesyn.cc
@@ -49,13 +49,13 @@ public:
 };
 
 
-int main(int argc, char **argv) 
+int main(int argc, const char **argv) 
 {
   cerr << "fakesyn start" << std::endl;
 
   //cerr << "inode_t " << sizeof(inode_t) << std::endl;
 
-  vector<char*> args;
+  vector<const char*> args;
   argv_to_vec(argc, argv, args);
 
   // stop on our own (by default)
@@ -68,7 +68,7 @@ int main(int argc, char **argv)
 
   parse_syn_options(args);
 
-  vector<char*> nargs;
+  vector<const char*> nargs;
 
   for (unsigned i=0; i<args.size(); i++) {
     // unknown arg, pass it on.

diff --git a/src/mkmonmap.cc b/src/mkmonmap.cc
index 32d88a0f3b2f1ff19360fe878e0d1d61c70cd58c..9ac9b56f14334a6aff1b9723c8832a46a424b6a3 100644 (file)
--- a/src/mkmonmap.cc
+++ b/src/mkmonmap.cc
@@ -29,14 +29,14 @@ using namespace std;
 
 
 
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
 {
-  vector<char*> args;
+  vector<const char*> args;
   argv_to_vec(argc, argv, args);
   
   MonMap monmap;
 
-  char *outfn = ".ceph_monmap";
+  const char *outfn = ".ceph_monmap";
 
   for (unsigned i=0; i<args.size(); i++) {
     if (strcmp(args[i], "--out") == 0) 

diff --git a/src/mon/MonMap.h b/src/mon/MonMap.h
index f8adebd3f405da4c2da84a23888b640fbfb1304b..818d84b95534d718aac0f81d88e2053d59054d29 100644 (file)
--- a/src/mon/MonMap.h
+++ b/src/mon/MonMap.h
@@ -77,7 +77,7 @@ class MonMap {
   }
 
   // read from/write to a file
-  int write(char *fn) {
+  int write(const char *fn) {
     // encode
     bufferlist bl;
     encode(bl);
@@ -91,7 +91,7 @@ class MonMap {
     return 0;
   }
 
-  int read(char *fn) {
+  int read(const char *fn) {
     // read
     bufferlist bl;
     int fd = ::open(fn, O_RDONLY);

diff --git a/src/newsyn.cc b/src/newsyn.cc
index 2ad65a85b0339f680f6d1f9e940955978ab9c5e9..ec75d93f404a8d7575593d97d63a4b1744bf651f 100644 (file)
--- a/src/newsyn.cc
+++ b/src/newsyn.cc
@@ -46,14 +46,14 @@ public:
 extern std::map<entity_name_t,float> g_fake_kill_after;
 
 bool use_existing_monmap = false;
-char *monmap_fn = ".ceph_monmap";
+const char *monmap_fn = ".ceph_monmap";
 /*
  * start up NewMessenger via MPI.
  */ 
 
-pair<int,int> mpi_bootstrap_new(int& argc, char**& argv, MonMap *monmap)
+pair<int,int> mpi_bootstrap_new(int& argc, const char**& argv, MonMap *monmap)
 {
-  MPI_Init(&argc, &argv);
+  MPI_Init(&argc, (char***)&argv);
   
   int mpi_world;
   int mpi_rank;
@@ -167,15 +167,15 @@ class C_Debug : public Context {
 };
 
 
-int main(int argc, char **argv) 
+int main(int argc, const char **argv) 
 {
-  vector<char*> args;
+  vector<const char*> args;
   argv_to_vec(argc, argv, args);
 
   map<int,int> kill_osd_after;
   int share_single_client = 0;
   if (1) {
-    vector<char*> nargs;
+    vector<const char*> nargs;
     for (unsigned i=0; i<args.size(); i++) {
       if (strcmp(args[i],"--kill_osd_after") == 0) {
         int o = atoi(args[++i]);
@@ -223,7 +223,7 @@ int main(int argc, char **argv)
     g_timer.add_event_after(g_conf.tick, new C_Tick);
   }
 
-  vector<char*> nargs;
+  vector<const char*> nargs;
   for (unsigned i=0; i<args.size(); i++) {
     //cout << "a " << args[i] << std::endl;
     // unknown arg, pass it on.

diff --git a/src/osd/FakeStore.h b/src/osd/FakeStore.h
index bbd7d82d3978ff63978954500734cb26862cd97b..979304991014caaaf87cec55fbb8485acf359c0b 100644 (file)
--- a/src/osd/FakeStore.h
+++ b/src/osd/FakeStore.h
@@ -56,7 +56,7 @@ class FakeStore : public ObjectStore {
   coll_t parse_coll(char *s);
 
  public:
-  FakeStore(char *base) : 
+  FakeStore(const char *base) : 
     basedir(base),
     unsync(0),
     attrs(this), fake_attrs(false), 

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index e3344618da7b95cddf61e4a9fb8c789cf68295d6..d8bd4b500411adc8c98e01690ea0fcdb8606c94b 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -74,8 +74,8 @@
 #define  dout(l)    if (l<=g_conf.debug || l<=g_conf.debug_osd) *_dout << dbeginl << g_clock.now() << " osd" << whoami << " " << (osdmap ? osdmap->get_epoch():0) << " "
 #define  derr(l)    if (l<=g_conf.debug || l<=g_conf.debug_osd) *_derr << dbeginl << g_clock.now() << " osd" << whoami << " " << (osdmap ? osdmap->get_epoch():0) << " "
 
-char *osd_base_path = "./osddata";
-char *ebofs_base_path = "./dev";
+const char *osd_base_path = "./osddata";
+const char *ebofs_base_path = "./dev";
 
 static const object_t SUPERBLOCK_OBJECT(0,0);
 
@@ -107,7 +107,7 @@ void OSD::force_remount()
 
 LogType osd_logtype;
 
-OSD::OSD(int id, Messenger *m, MonMap *mm, char *dev) : 
+OSD::OSD(int id, Messenger *m, MonMap *mm, const char *dev) : 
   timer(osd_lock),
   stat_oprate(5.0),
   read_latency_calc(g_conf.osd_max_opq<1 ? 1:g_conf.osd_max_opq),

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index f49f22e1aef95116c2a67a7c9f0fdcef3f19cde5..47959cbb634e2d71d8cb5593ae485722ba717c5b 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -349,7 +349,7 @@ private:
 
 
  public:
-  OSD(int id, Messenger *m, MonMap *mm, char *dev = 0);
+  OSD(int id, Messenger *m, MonMap *mm, const char *dev = 0);
   ~OSD();
 
   // startup/shutdown