Use 'const char *' for pointers to static strings.

Make g++ 4.2.3 happy for -Werror.

Author: sit

dhash/dhblock_chash_srv.C

@@ -85,7 +85,7 @@ dhblock_chash_srv::stats (vec<dstat> &s)
 void
 dhblock_chash_srv::store (chordID key, str d, u_int32_t expire, cb_dhstat cb)
 {
-  char *action;
+  const char *action;
 
   if (1) {  // without maintaining our own merkle tree, we can't know
     action = "N"; // New

dhash/dhblock_srv.C

@@ -45,7 +45,7 @@ dhblock_srv::~dhblock_srv ()
 str
 dhblock_srv::prefix () const
 {
-  char *p = "unknown";
+  const char *p = "unknown";
   switch (ctype) {
     case DHASH_CONTENTHASH:
       p = "chash";

lsd/adbd.C

@@ -423,7 +423,7 @@ dbns::insert (const chordID &key, DBT &data, u_int32_t auxdata, u_int32_t exptim
   DBT skey;
   id_to_dbt (key, &skey);
 
-  char *err = "";
+  const char *err = "";
   int ret;
   if (exptime > timenow + expire_buffer) {
     // Only add to Merkle tree if this object is worth repairing.
@@ -568,7 +568,7 @@ dbns::del (const chordID &key, u_int32_t auxdata)
   }
 
   // Only attempt to update Merkle tree if object was present.
-  char *err = "";
+  const char *err = "";
   if (hasaux ()) {
     err = "mtree->remove aux";
     r = mtree->remove (key, auxdata, t);
@@ -834,7 +834,7 @@ dbns::expire (u_int32_t limit, u_int32_t deadline)
     chordID id = dbt_to_id (key);
     warnx ("%d.%06d ", int (tsnow.tv_sec), int (tsnow.tv_nsec/1000))
       << name << ": Expiring " << id << "\n";
-    char *err = "";
+    const char *err = "";
     do {
       err = "mtree->remove";
       if (hasaux ()) {

lsd/lsd.C

@@ -92,8 +92,8 @@ enum routing_mode_t {
 
 struct routing_mode_desc {
   routing_mode_t m;
-  char *cmdline;
-  char *desc;
+  const char *cmdline;
+  const char *desc;
   vnode_producer_t producer;
 };					       
 

lsd/lsdctl.C

@@ -8,7 +8,7 @@
 bool opt_verbose;
 bool opt_quiet;
 int  opt_timeout (120);
-char *control_socket = "/tmp/lsdctl-sock";
+const char *control_socket = "/tmp/lsdctl-sock";
 
 /* Prototypes for table. */
 void lsdctl_help (int argc, char *argv[]);
@@ -397,7 +397,9 @@ int
 main (int argc, char *argv[])
 {
   setprogname (argv[0]);
-  putenv ("POSIXLY_CORRECT=1"); // Prevents Linux from reordering options
+  // Prevents Linux from reordering options
+  if (setenv ("POSIXLY_CORRECT", "1", 1) != 0)
+    fatal ("setenv: %m\n");
 
   int ch;
   while ((ch = getopt (argc, argv, "S:t:vq")) != -1)

maint/maintd.C

@@ -14,9 +14,9 @@
 #include "maint_policy.h"
 
 // {{{ Globals
-static char *ctlsock;
-static char *logfname;
-static char *localdatapath;
+static const char *ctlsock;
+static const char *logfname;
+static const char *localdatapath;
 
 static vec<ptr<maintainer> > maintainers;
 
@@ -26,7 +26,7 @@ enum maint_mode_t {
 } maint_mode;
 struct maint_mode_desc {
   maint_mode_t m;
-  char *cmdline;
+  const char *cmdline;
   maintainer_producer_t producer;
 } maint_modes[] = {
   { MAINT_CARBONITE, "carbonite", 
@@ -41,7 +41,7 @@ enum sync_mode_t {
 } sync_mode;
 struct sync_mode_desc {
   sync_mode_t m;
-  char *cmdline;
+  const char *cmdline;
   syncer_producer_t producer;
 } sync_modes[] = {
   { SYNC_MERKLE, "merkle", &merkle_sync::produce_syncer }

merkle/merkle_tree_bdb.C

@@ -304,7 +304,7 @@ merkle_tree_bdb::init_db (bool ro)
   r = dbfe_txn_begin (dbe, &t);
 
   // BTree makes the most sense for a tree structure.
-  char *err = "";
+  const char *err = "";
   do {
     err = "nodedb->create";
     r = db_create (&nodedb, dbe, 0);

tools/dbdump.C

@@ -4,7 +4,7 @@
 #include <dbfe.h>
 #include <adb_prot.h>
 
-static char *usage = "usage: dbdump [-t|-m] dbhome\n";
+static const char *usage = "usage: dbdump [-t|-m] dbhome\n";
 
 static DB_ENV* dbe = NULL;
 static DB *metadatadb = NULL;

tools/lsdping.C

@@ -44,7 +44,7 @@ void doit (chord_node dst, int seqno) {
   }
 }
 
-static char *usage = "lsdping: [-n numpersecond] host port vnodenum";
+static const char *usage = "lsdping: [-n numpersecond] host port vnodenum";
 
 int
 main (int argc, char *argv[])

tools/maintwalk.C

@@ -29,7 +29,7 @@ usage ()
 static chordID wellknown_ID = -1;
 // Sequential is what we believe is the correct sequencing of nodes
 static vec<chord_node> sequential;
-static char *localdatapath;
+static const char *localdatapath;
 static u_int64_t totalbytes = 0;
 static u_int64_t starttime = 0;
 

tools/nodeq.C

@@ -12,7 +12,7 @@
 
 #include "rpclib.h"
 
-char *usage = "Usage: nodeq [-m] [-r] host port vnode\n";
+const char *usage = "Usage: nodeq [-m] [-r] host port vnode\n";
 
 int outstanding = 0;
 int errors = 0;

utils/dbfe.C

@@ -62,7 +62,7 @@ dbGetImplInfo() {
 dbOptions::dbOptions()  {}
 
 int verifyOption (const char *optionSig) {
-  vec<char *> allowed = dbGetImplInfo()->supportedOptions;
+  vec<const char *> allowed = dbGetImplInfo()->supportedOptions;
   for (unsigned int i=0; i < allowed.size(); i++) 
     if (memcmp(allowed[i], optionSig, strlen(allowed[i])) == 0) return 1;
   return 0;

utils/dbfe.h

@@ -108,7 +108,7 @@ struct dbOptions {
 };
 
 struct dbImplInfo {
-  vec<char *> supportedOptions;
+  vec<const char *> supportedOptions;
 
   dbImplInfo() { };
 };

utils/modlogger.C

@@ -4,7 +4,7 @@
 int modlogger::logfd = 2;
 int modlogger::maxprio = modlogger::INFO;
 
-modlogger::modlogger (char *module, int p) : prio (p)
+modlogger::modlogger (const char *module, int p) : prio (p)
 {
   /* Don't expect to be outputting, so don't make syscall */
   if (prio > maxprio)

utils/modlogger.h

@@ -18,7 +18,7 @@ class modlogger : public strbuf {
     INFO  = 1,
     TRACE = 2
   };
-  explicit modlogger (char *module, int prio = INFO);
+  explicit modlogger (const char *module, int prio = INFO);
   ~modlogger ();
   const modlogger &operator () (const char *fmt, ...) const
     __attribute__ ((format (printf, 2, 3)));