Make all tapsets' TOK_FOO constant

7 files changed, 34 insertions, 34 deletions

diff --git a/tapset-been.cxx b/tapset-been.cxx
index e007a4f7..d695bdf3 100644
--- a/tapset-been.cxx
+++ b/tapset-been.cxx
@@ -21,10 +21,10 @@ using namespace std;
 using namespace __gnu_cxx;
 
 
-static string TOK_BEGIN("begin");
-static string TOK_END("end");
-static string TOK_ERROR("error");
-static string TOK_NEVER("never");
+static const string TOK_BEGIN("begin");
+static const string TOK_END("end");
+static const string TOK_ERROR("error");
+static const string TOK_NEVER("never");
 
 
 // ------------------------------------------------------------------------
diff --git a/tapset-itrace.cxx b/tapset-itrace.cxx
index 38304a98..ebfa57ac 100644
--- a/tapset-itrace.cxx
+++ b/tapset-itrace.cxx
@@ -23,9 +23,9 @@ using namespace std;
 using namespace __gnu_cxx;
 
 
-static string TOK_PROCESS("process");
-static string TOK_INSN("insn");
-static string TOK_BLOCK("block");
+static const string TOK_PROCESS("process");
+static const string TOK_INSN("insn");
+static const string TOK_BLOCK("block");
 
 
 // ------------------------------------------------------------------------
diff --git a/tapset-mark.cxx b/tapset-mark.cxx
index 1f0ef2ce..7544d7bb 100644
--- a/tapset-mark.cxx
+++ b/tapset-mark.cxx
@@ -27,9 +27,9 @@ using namespace std;
 using namespace __gnu_cxx;
 
 
-static string TOK_KERNEL("kernel");
-static string TOK_MARK("mark");
-static string TOK_FORMAT("format");
+static const string TOK_KERNEL("kernel");
+static const string TOK_MARK("mark");
+static const string TOK_FORMAT("format");
 
 
 // ------------------------------------------------------------------------
diff --git a/tapset-procfs.cxx b/tapset-procfs.cxx
index 3568c3d3..63a59afb 100644
--- a/tapset-procfs.cxx
+++ b/tapset-procfs.cxx
@@ -22,9 +22,9 @@ using namespace std;
 using namespace __gnu_cxx;
 
 
-static string TOK_PROCFS("procfs");
-static string TOK_READ("read");
-static string TOK_WRITE("write");
+static const string TOK_PROCFS("procfs");
+static const string TOK_READ("read");
+static const string TOK_WRITE("write");
 
 
 // ------------------------------------------------------------------------
diff --git a/tapset-timers.cxx b/tapset-timers.cxx
index d32a22a6..1dc0acac 100644
--- a/tapset-timers.cxx
+++ b/tapset-timers.cxx
@@ -22,7 +22,7 @@ using namespace std;
 using namespace __gnu_cxx;
 
 
-static string TOK_TIMER("timer");
+static const string TOK_TIMER("timer");
 
 
 // ------------------------------------------------------------------------
diff --git a/tapset-utrace.cxx b/tapset-utrace.cxx
index 41a6f24f..64f546e6 100644
--- a/tapset-utrace.cxx
+++ b/tapset-utrace.cxx
@@ -23,12 +23,12 @@ using namespace std;
 using namespace __gnu_cxx;
 
 
-static string TOK_PROCESS("process");
-static string TOK_BEGIN("begin");
-static string TOK_END("end");
-static string TOK_THREAD("thread");
-static string TOK_SYSCALL("syscall");
-static string TOK_RETURN("return");
+static const string TOK_PROCESS("process");
+static const string TOK_BEGIN("begin");
+static const string TOK_END("end");
+static const string TOK_THREAD("thread");
+static const string TOK_SYSCALL("syscall");
+static const string TOK_RETURN("return");
 
 
 // ------------------------------------------------------------------------
diff --git a/tapsets.cxx b/tapsets.cxx
index 1728ec9e..a9ef2487 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -246,19 +246,19 @@ common_probe_entryfn_epilogue (translator_output* o,
 //  Dwarf derived probes.  "We apologize for the inconvience."
 // ------------------------------------------------------------------------
 
-static string TOK_KERNEL("kernel");
-static string TOK_MODULE("module");
-static string TOK_FUNCTION("function");
-static string TOK_INLINE("inline");
-static string TOK_CALL("call");
-static string TOK_RETURN("return");
-static string TOK_MAXACTIVE("maxactive");
-static string TOK_STATEMENT("statement");
-static string TOK_ABSOLUTE("absolute");
-static string TOK_PROCESS("process");
-static string TOK_MARK("mark");
-static string TOK_TRACE("trace");
-static string TOK_LABEL("label");
+static const string TOK_KERNEL("kernel");
+static const string TOK_MODULE("module");
+static const string TOK_FUNCTION("function");
+static const string TOK_INLINE("inline");
+static const string TOK_CALL("call");
+static const string TOK_RETURN("return");
+static const string TOK_MAXACTIVE("maxactive");
+static const string TOK_STATEMENT("statement");
+static const string TOK_ABSOLUTE("absolute");
+static const string TOK_PROCESS("process");
+static const string TOK_MARK("mark");
+static const string TOK_TRACE("trace");
+static const string TOK_LABEL("label");
 
 static int query_cu (Dwarf_Die * cudie, void * arg);
 
@@ -4461,7 +4461,7 @@ uprobe_derived_probe_group::emit_module_exit (systemtap_session& s)
 // Kprobe derived probes
 // ------------------------------------------------------------------------
 
-static string TOK_KPROBE("kprobe");
+static const string TOK_KPROBE("kprobe");
 
 struct kprobe_derived_probe: public derived_probe
 {