Backout accidental checkin of 149dfce94388

js/src/jsprobes.cpp

@@ -51,9 +51,9 @@
 
 using namespace js;
 
-char Probes::nullName[] = "(null)";
+const char Probes::nullName[] = "(null)";
 
-char *
+const char *
 Probes::FunctionClassname(const JSFunction *fun)
 {
     return (fun && !FUN_INTERPRETED(fun) && !(fun->flags & JSFUN_TRCINFO) && FUN_CLASP(fun))
@@ -61,7 +61,7 @@ Probes::FunctionClassname(const JSFunction *fun)
            : nullName;
 }
 
-char *
+const char *
 Probes::ScriptFilename(JSScript *script)
 {
     return (script && script->filename) ? (char *)script->filename : nullName;
@@ -123,7 +123,7 @@ jsprobes_jsvaltovoid(JSContext *cx, const js::Value &argval)
 }
 #endif
 
-char *
+const char *
 Probes::FunctionName(JSContext *cx, const JSFunction *fun)
 {
     if (!fun)

js/src/jsprobes.h

@@ -45,12 +45,12 @@
 namespace js {
 
 class Probes {
-    static char nullName[];
+    static const char nullName[];
 
-    static char *FunctionClassname(const JSFunction *fun);
-    static char *ScriptFilename(JSScript *script);
+    static const char *FunctionClassname(const JSFunction *fun);
+    static const char *ScriptFilename(JSScript *script);
     static int FunctionLineNumber(JSContext *cx, const JSFunction *fun);
-    static char *FunctionName(JSContext *cx, const JSFunction *fun);
+    static const char *FunctionName(JSContext *cx, const JSFunction *fun);
 
     static void enterJSFunImpl(JSContext *cx, const JSFunction *fun);
     static void handleFunctionReturn(JSContext *cx, JSFunction *fun);