Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 835719 - 0003. Rename JSAutoByteString.encode() to encodeLatin1(). r=terrence

Browse Source
This commit is contained in:
Chuck Lee 2013-02-21 17:48:17 +08:00
parent 124f4fc7d7
commit 5cfe2d786d
20 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ipc/testshell/XPCShellEnvironment.cpp
View File

@ -427,7 +427,7 @@ DumpHeap(JSContext *cx,
if (!str)
return JS_FALSE;
*vp = STRING_TO_JSVAL(str);
if (!fileName.encode(cx, str))
if (!fileName.encodeLatin1(cx, str))
return JS_FALSE;
}
@ -618,7 +618,7 @@ ProcessFile(JSContext *cx,
str = JS_ValueToString(cx, result);
JSAutoByteString bytes;
if (str)
bytes.encode(cx, str);
bytes.encodeLatin1(cx, str);
JS_SetErrorReporter(cx, older);
if (!!bytes)

2
js/src/builtin/TestingFunctions.cpp
View File

@ -771,7 +771,7 @@ DumpHeapComplete(JSContext *cx, unsigned argc, jsval *vp)
Value v = JS_ARGV(cx, vp)[0];
if (v.isString()) {
JSString *str = v.toString();
if (!fileNameBytes.encode(cx, str))
if (!fileNameBytes.encodeLatin1(cx, str))
return false;
fileName = fileNameBytes.ptr();
}

2
js/src/ctypes/CTypes.cpp
View File

@ -805,7 +805,7 @@ TypeError(JSContext* cx, const char* expected, jsval actual)
const char* src;
if (str) {
src = bytes.encode(cx, str);
src = bytes.encodeLatin1(cx, str);
if (!src)
return false;
} else {

2
js/src/jsapi.h
View File

@ -4495,7 +4495,7 @@ class JSAutoByteString
mBytes = bytes;
}
char *encode(JSContext *cx, JSString *str) {
char *encodeLatin1(JSContext *cx, JSString *str) {
JS_ASSERT(!mBytes);
JS_ASSERT(cx);
mBytes = JS_EncodeString(cx, str);

6
js/src/jsdbgapi.cpp
View File

@ -1102,7 +1102,7 @@ FormatValue(JSContext *cx, const Value &v, JSAutoByteString &bytes)
JSString *str = ToString<CanGC>(cx, v);
if (!str)
return NULL;
const char *buf = bytes.encode(cx, str);
const char *buf = bytes.encodeLatin1(cx, str);
if (!buf)
return NULL;
const char *found = strstr(buf, "function ");
@ -1151,7 +1151,7 @@ FormatFrame(JSContext *cx, const ScriptFrameIter &iter, char *buf, int num,
// print the frame number and function name
if (funname) {
JSAutoByteString funbytes;
buf = JS_sprintf_append(buf, "%d %s(", num, funbytes.encode(cx, funname));
buf = JS_sprintf_append(buf, "%d %s(", num, funbytes.encodeLatin1(cx, funname));
} else if (fun) {
buf = JS_sprintf_append(buf, "%d anonymous(", num);
} else {
@ -1249,7 +1249,7 @@ FormatFrame(JSContext *cx, const ScriptFrameIter &iter, char *buf, int num,
JSAutoByteString thisValBytes;
RootedString thisValStr(cx, ToString<CanGC>(cx, thisVal));
if (thisValStr) {
if (const char *str = thisValBytes.encode(cx, thisValStr)) {
if (const char *str = thisValBytes.encodeLatin1(cx, thisValStr)) {
buf = JS_sprintf_append(buf, " this = %s\n", str);
if (!buf)
return buf;

4
js/src/jsexn.cpp
View File

@ -1086,7 +1086,7 @@ js_ReportUncaughtException(JSContext *cx)
if (JS_GetProperty(cx, exnObject, filename_str, &roots[4])) {
RawString tmp = ToString<CanGC>(cx, roots[4]);
if (tmp)
filename.encode(cx, tmp);
filename.encodeLatin1(cx, tmp);
}
uint32_t lineno;
@ -1118,7 +1118,7 @@ js_ReportUncaughtException(JSContext *cx)
JSAutoByteString bytesStorage;
const char *bytes = NULL;
if (str)
bytes = bytesStorage.encode(cx, str);
bytes = bytesStorage.encodeLatin1(cx, str);
if (!bytes)
bytes = "unknown (can't convert to string)";

2
js/src/jsfuninlines.h
View File

@ -142,7 +142,7 @@ GetFunctionNameBytes(JSContext *cx, JSFunction *fun, JSAutoByteString *bytes)
{
JSAtom *atom = fun->atom();
if (atom)
return bytes->encode(cx, atom);
return bytes->encodeLatin1(cx, atom);
return js_anonymous_str;
}

4
js/src/jsopcode.cpp
View File

@ -509,7 +509,7 @@ ToDisassemblySource(JSContext *cx, jsval v, JSAutoByteString *bytes)
JSString *str = JS_DecompileFunction(cx, obj->toFunction(), JS_DONT_PRETTY_PRINT);
if (!str)
return false;
return bytes->encode(cx, str);
return bytes->encodeLatin1(cx, str);
}
if (obj->isRegExp()) {
@ -517,7 +517,7 @@ ToDisassemblySource(JSContext *cx, jsval v, JSAutoByteString *bytes)
if (!source)
return false;
JS::Anchor<JSString *> anchor(source);
return bytes->encode(cx, source);
return bytes->encodeLatin1(cx, source);
}
}

2
js/src/jsprobes.cpp
View File

@ -165,7 +165,7 @@ FunctionName(JSContext *cx, UnrootedFunction fun, JSAutoByteString* bytes)
return Probes::nullName;
if (!fun->displayAtom())
return Probes::anonymousName;
return bytes->encode(cx, fun->displayAtom()) ? bytes->ptr() : Probes::nullName;
return bytes->encodeLatin1(cx, fun->displayAtom()) ? bytes->ptr() : Probes::nullName;
}
/*

2
js/src/jsstr.cpp
View File

@ -3626,7 +3626,7 @@ js_ValueToPrintable(JSContext *cx, const Value &v, JSAutoByteString *bytes, bool
str = js_QuoteString(cx, str, 0);
if (!str)
return NULL;
return bytes->encode(cx, str);
return bytes->encodeLatin1(cx, str);
}
template <AllowGC allowGC>

8
js/src/shell/js.cpp
View File

@ -222,7 +222,7 @@ class ToStringHelper
bool threw() { return !mStr; }
jsval getJSVal() { return STRING_TO_JSVAL(mStr); }
const char *getBytes() {
if (mStr && (mBytes.ptr() || mBytes.encode(cx, mStr)))
if (mStr && (mBytes.ptr() || mBytes.encodeLatin1(cx, mStr)))
return mBytes.ptr();
return "(error converting value)";
}
@ -866,7 +866,7 @@ Evaluate(JSContext *cx, unsigned argc, jsval *vp)
JSString *s = JS_ValueToString(cx, v);
if (!s)
return false;
fileName = fileNameBytes.encode(cx, s);
fileName = fileNameBytes.encodeLatin1(cx, s);
if (!fileName)
return false;
}
@ -1271,7 +1271,7 @@ ToSource(JSContext *cx, jsval *vp, JSAutoByteString *bytes)
JSString *str = JS_ValueToSource(cx, *vp);
if (str) {
*vp = STRING_TO_JSVAL(str);
if (bytes->encode(cx, str))
if (bytes->encodeLatin1(cx, str))
return bytes->ptr();
}
JS_ClearPendingException(cx);
@ -2040,7 +2040,7 @@ DumpHeap(JSContext *cx, unsigned argc, jsval *vp)
if (!str)
return false;
JS_ARGV(cx, vp)[0] = STRING_TO_JSVAL(str);
if (!fileNameBytes.encode(cx, str))
if (!fileNameBytes.encodeLatin1(cx, str))
return false;
fileName = fileNameBytes.ptr();
}

2
js/src/vm/Debugger.cpp
View File

@ -2457,7 +2457,7 @@ class Debugger::ScriptQuery {
bool prepareQuery() {
/* Compute urlCString, if a url was given. */
if (url.isString()) {
if (!urlCString.encode(cx, url.toString()))
if (!urlCString.encodeLatin1(cx, url.toString()))
return false;
}

4
js/xpconnect/shell/xpcshell.cpp
View File

@ -584,7 +584,7 @@ DumpHeap(JSContext *cx, unsigned argc, jsval *vp)
if (!str)
return false;
*vp = STRING_TO_JSVAL(str);
if (!fileName.encode(cx, str))
if (!fileName.encodeLatin1(cx, str))
return false;
}
@ -1089,7 +1089,7 @@ ProcessFile(JSContext *cx, JSObject *obj, const char *filename, FILE *file,
str = JS_ValueToString(cx, result);
JS_SetErrorReporter(cx, older);
JSAutoByteString bytes;
if (str && bytes.encode(cx, str))
if (str && bytes.encodeLatin1(cx, str))
fprintf(gOutFile, "%s\n", bytes.ptr());
else
ok = false;

16
js/xpconnect/src/XPCComponents.cpp
View File

@ -320,7 +320,7 @@ nsXPCComponents_Interfaces::NewResolve(nsIXPConnectWrappedNative *wrapper,
JSAutoByteString name;
if (mManager &&
JSID_IS_STRING(id) &&
name.encode(cx, JSID_TO_STRING(id)) &&
name.encodeLatin1(cx, JSID_TO_STRING(id)) &&
name.ptr()[0] != '{') { // we only allow interfaces by name here
nsCOMPtr<nsIInterfaceInfo> info;
mManager->GetInfoForName(name.ptr(), getter_AddRefs(info));
@ -916,7 +916,7 @@ nsXPCComponents_Classes::NewResolve(nsIXPConnectWrappedNative *wrapper,
JSAutoByteString name;
if (JSID_IS_STRING(id) &&
name.encode(cx, JSID_TO_STRING(id)) &&
name.encodeLatin1(cx, JSID_TO_STRING(id)) &&
name.ptr()[0] != '{') { // we only allow contractids here
nsCOMPtr<nsIJSCID> nsid =
dont_AddRef(static_cast<nsIJSCID*>(nsJSCID::NewID(name.ptr())));
@ -1172,7 +1172,7 @@ nsXPCComponents_ClassesByID::NewResolve(nsIXPConnectWrappedNative *wrapper,
JSAutoByteString name;
if (JSID_IS_STRING(id) &&
name.encode(cx, JSID_TO_STRING(id)) &&
name.encodeLatin1(cx, JSID_TO_STRING(id)) &&
name.ptr()[0] == '{' &&
IsRegisteredCLSID(name.ptr())) { // we only allow canonical CLSIDs here
nsCOMPtr<nsIJSCID> nsid =
@ -1398,7 +1398,7 @@ nsXPCComponents_Results::NewResolve(nsIXPConnectWrappedNative *wrapper,
{
JSAutoByteString name;
if (JSID_IS_STRING(id) && name.encode(cx, JSID_TO_STRING(id))) {
if (JSID_IS_STRING(id) && name.encodeLatin1(cx, JSID_TO_STRING(id))) {
const char* rv_name;
void* iter = nullptr;
nsresult rv;
@ -1618,7 +1618,7 @@ nsXPCComponents_ID::CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
nsID id;
if (!(jsstr = JS_ValueToString(cx, argv[0])) ||
!bytes.encode(cx, jsstr) ||
!bytes.encodeLatin1(cx, jsstr) ||
!id.Parse(bytes.ptr())) {
return ThrowAndFail(NS_ERROR_XPC_BAD_ID_STRING, cx, _retval);
}
@ -1872,7 +1872,7 @@ struct NS_STACK_CLASS ExceptionArgParser
JSString *str = JS_ValueToString(cx, v);
if (!str)
return false;
eMsg = messageBytes.encode(cx, str);
eMsg = messageBytes.encodeLatin1(cx, str);
return !!eMsg;
}
@ -2496,7 +2496,7 @@ nsXPCComponents_Constructor::CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
if (argc >= 3) {
// argv[2] is an initializer function or property name
JSString* str = JS_ValueToString(cx, argv[2]);
if (!str || !(cInitializer = cInitializerBytes.encode(cx, str)))
if (!str || !(cInitializer = cInitializerBytes.encodeLatin1(cx, str)))
return ThrowAndFail(NS_ERROR_XPC_BAD_CONVERT_JS, cx, _retval);
}
@ -3838,7 +3838,7 @@ nsXPCComponents_Utils::EvalInSandbox(const nsAString& source,
return NS_ERROR_INVALID_ARG;
JSAutoByteString filenameBytes;
if (!filenameBytes.encode(cx, filenameStr))
if (!filenameBytes.encodeLatin1(cx, filenameStr))
return NS_ERROR_INVALID_ARG;
filename = filenameBytes.ptr();
} else {

2
js/xpconnect/src/XPCConvert.cpp
View File

@ -1202,7 +1202,7 @@ XPCConvert::JSValToXPCException(XPCCallContext& ccx,
JSAutoByteString message;
JSString* str;
if (nullptr != (str = JS_ValueToString(cx, s)))
message.encode(cx, str);
message.encodeLatin1(cx, str);
return JSErrorToXPCException(ccx, message.ptr(), ifaceName,
methodName, report, exceptn);
}

2
js/xpconnect/src/XPCDebug.cpp
View File

@ -107,7 +107,7 @@ xpc_DumpEvalInJSStackFrame(JSContext* cx, uint32_t frameno, const char* text)
JSAutoByteString bytes;
if (frame.evaluateInStackFrame(cx, text, strlen(text), "eval", 1, &rval) &&
nullptr != (str = JS_ValueToString(cx, rval)) &&
bytes.encode(cx, str)) {
bytes.encodeLatin1(cx, str)) {
DebugDump("%s\n", bytes.ptr());
} else
DebugDump("%s", "eval failed!\n");

6
js/xpconnect/src/XPCQuickStubs.cpp
View File

@ -436,7 +436,7 @@ ThrowCallFailed(JSContext *cx, nsresult rv,
JSAutoByteString memberNameBytes;
if (!memberName) {
memberName = JSID_IS_STRING(memberId)
? memberNameBytes.encode(cx, JSID_TO_STRING(memberId))
? memberNameBytes.encodeLatin1(cx, JSID_TO_STRING(memberId))
: "unknown";
}
if (nsXPCException::NameAndFormatForNSResult(rv, &name, nullptr)
@ -506,7 +506,7 @@ ThrowBadArg(JSContext *cx, nsresult rv, const char *ifaceName,
JSAutoByteString memberNameBytes;
if (!memberName) {
memberName = JSID_IS_STRING(memberId)
? memberNameBytes.encode(cx, JSID_TO_STRING(memberId))
? memberNameBytes.encodeLatin1(cx, JSID_TO_STRING(memberId))
: "unknown";
}
sz = JS_smprintf("%s arg %u [%s.%s]",
@ -881,7 +881,7 @@ xpc_qsJsvalToCharStr(JSContext *cx, jsval v, JSAutoByteString *bytes)
if (!(str = JS_ValueToString(cx, v)))
return false;
}
return !!bytes->encode(cx, str);
return !!bytes->encodeLatin1(cx, str);
}
JSBool

2
js/xpconnect/src/XPCThrower.cpp
View File

@ -154,7 +154,7 @@ XPCThrower::Verbosify(XPCCallContext& ccx,
XPCNativeInterface* iface = ccx.GetInterface();
jsid id = ccx.GetMember()->GetName();
JSAutoByteString bytes;
const char *name = JSID_IS_VOID(id) ? "Unknown" : bytes.encode(ccx, JSID_TO_STRING(id));
const char *name = JSID_IS_VOID(id) ? "Unknown" : bytes.encodeLatin1(ccx, JSID_TO_STRING(id));
if (!name) {
name = "";
}

6
js/xpconnect/src/XPCWrappedNativeJSOps.cpp
View File

@ -316,7 +316,7 @@ DefinePropertyIfFound(XPCCallContext& ccx,
nsresult rv = NS_OK;
if (JSID_IS_STRING(id) &&
name.encode(ccx, JSID_TO_STRING(id)) &&
name.encodeLatin1(ccx, JSID_TO_STRING(id)) &&
(iface2 = XPCNativeInterface::GetNewOrUsed(ccx, name.ptr()), iface2) &&
nullptr != (to = wrapperToReflectInterfaceNames->
FindTearOff(ccx, iface2, true, &rv)) &&
@ -1397,7 +1397,7 @@ XPC_WN_CallMethod(JSContext *cx, unsigned argc, jsval *vp)
JSFunction* fun = funobj->getFunctionPrivate();
JSString *funid = JS_GetFunctionDisplayId(fun);
JSAutoByteString bytes;
const char *funname = !funid ? "" : bytes.encode(cx, funid) ? bytes.ptr() : "<error>";
const char *funname = !funid ? "" : bytes.encodeLatin1(cx, funid) ? bytes.ptr() : "<error>";
SLIM_LOG_WILL_MORPH_FOR_PROP(cx, obj, funname);
}
#endif
@ -1433,7 +1433,7 @@ XPC_WN_GetterSetter(JSContext *cx, unsigned argc, jsval *vp)
JSAutoByteString bytes;
if (JS_TypeOfValue(cx, JS_CALLEE(cx, vp)) == JSTYPE_FUNCTION) {
JSString *funid = JS_GetFunctionDisplayId(funobj->getFunctionPrivate());
funname = !funid ? "" : bytes.encode(cx, funid) ? bytes.ptr() : "<error>";
funname = !funid ? "" : bytes.encodeLatin1(cx, funid) ? bytes.ptr() : "<error>";
}
SLIM_LOG_WILL_MORPH_FOR_PROP(cx, obj, funname);
}

12
security/manager/ssl/src/nsCrypto.cpp
View File

@ -929,7 +929,7 @@ cryptojs_ReadArgsAndGenerateKey(JSContext *cx,
jsString = JS_ValueToString(cx,argv[1]);
NS_ENSURE_TRUE(jsString, NS_ERROR_OUT_OF_MEMORY);
argv[1] = STRING_TO_JSVAL(jsString);
params.encode(cx, jsString);
params.encodeLatin1(cx, jsString);
NS_ENSURE_TRUE(!!params, NS_ERROR_OUT_OF_MEMORY);
}
@ -941,7 +941,7 @@ cryptojs_ReadArgsAndGenerateKey(JSContext *cx,
jsString = JS_ValueToString(cx, argv[2]);
NS_ENSURE_TRUE(jsString, NS_ERROR_OUT_OF_MEMORY);
argv[2] = STRING_TO_JSVAL(jsString);
keyGenAlg.encode(cx, jsString);
keyGenAlg.encodeLatin1(cx, jsString);
NS_ENSURE_TRUE(!!keyGenAlg, NS_ERROR_OUT_OF_MEMORY);
keyGenType->keyGenType = cryptojs_interpret_key_gen_type(keyGenAlg.ptr());
if (keyGenType->keyGenType == invalidKeyGen) {
@ -1886,7 +1886,7 @@ nsCrypto::GenerateCRMFRequest(nsIDOMCRMFObject** aReturn)
jsString = JS_ValueToString(cx, argv[1]);
NS_ENSURE_TRUE(jsString, NS_ERROR_OUT_OF_MEMORY);
argv[1] = STRING_TO_JSVAL(jsString);
regToken.encode(cx, jsString);
regToken.encodeLatin1(cx, jsString);
NS_ENSURE_TRUE(!!regToken, NS_ERROR_OUT_OF_MEMORY);
}
JSAutoByteString authenticator;
@ -1894,7 +1894,7 @@ nsCrypto::GenerateCRMFRequest(nsIDOMCRMFObject** aReturn)
jsString = JS_ValueToString(cx, argv[2]);
NS_ENSURE_TRUE(jsString, NS_ERROR_OUT_OF_MEMORY);
argv[2] = STRING_TO_JSVAL(jsString);
authenticator.encode(cx, jsString);
authenticator.encodeLatin1(cx, jsString);
NS_ENSURE_TRUE(!!authenticator, NS_ERROR_OUT_OF_MEMORY);
}
JSAutoByteString eaCert;
@ -1902,7 +1902,7 @@ nsCrypto::GenerateCRMFRequest(nsIDOMCRMFObject** aReturn)
jsString = JS_ValueToString(cx, argv[3]);
NS_ENSURE_TRUE(jsString, NS_ERROR_OUT_OF_MEMORY);
argv[3] = STRING_TO_JSVAL(jsString);
eaCert.encode(cx, jsString);
eaCert.encodeLatin1(cx, jsString);
NS_ENSURE_TRUE(!!eaCert, NS_ERROR_OUT_OF_MEMORY);
}
if (JSVAL_IS_NULL(argv[4])) {
@ -2553,7 +2553,7 @@ nsCrypto::SignText(const nsAString& aStringToSign, const nsAString& aCaOption,
JSString *caName = JS_ValueToString(cx, argv[i]);
NS_ENSURE_TRUE(caName, NS_ERROR_OUT_OF_MEMORY);
argv[i] = STRING_TO_JSVAL(caName);
caNameBytes[i - 2].encode(cx, caName);
caNameBytes[i - 2].encodeLatin1(cx, caName);
NS_ENSURE_TRUE(!!caNameBytes[i - 2], NS_ERROR_OUT_OF_MEMORY);
}