From 62f83eb673471fef149db17bada33331b66f4f46 Mon Sep 17 00:00:00 2001 From: elexis Date: Tue, 23 Jul 2019 15:17:35 +0000 Subject: [PATCH] Use ToJSVal for JS_NewStringCopyZ to improve encapsulation and consistency and remove a snprintf call. This was SVN commit r22536. --- source/gui/scripting/JSInterface_GUITypes.cpp | 5 ++--- source/gui/scripting/JSInterface_IGUIObject.cpp | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/source/gui/scripting/JSInterface_GUITypes.cpp b/source/gui/scripting/JSInterface_GUITypes.cpp index cebc25e7a1..3cdac32268 100644 --- a/source/gui/scripting/JSInterface_GUITypes.cpp +++ b/source/gui/scripting/JSInterface_GUITypes.cpp @@ -118,11 +118,10 @@ bool JSI_GUISize::toString(JSContext* cx, uint argc, JS::Value* vp) } catch (PSERROR_Scripting_ConversionFailed&) { - rec.rval().setString(JS_NewStringCopyZ(cx, "")); + ScriptInterface::ToJSVal(cx, rec.rval(), std::string("")); return true; } - - rec.rval().setString(JS_NewStringCopyZ(cx, buffer.c_str())); + ScriptInterface::ToJSVal(cx, rec.rval(), buffer); return true; } diff --git a/source/gui/scripting/JSInterface_IGUIObject.cpp b/source/gui/scripting/JSInterface_IGUIObject.cpp index 1ed10f8363..440fcc88b8 100644 --- a/source/gui/scripting/JSInterface_IGUIObject.cpp +++ b/source/gui/scripting/JSInterface_IGUIObject.cpp @@ -591,10 +591,7 @@ bool JSI_IGUIObject::toString(JSContext* cx, uint UNUSED(argc), JS::Value* vp) if (!e) return false; - char buffer[256]; - snprintf(buffer, 256, "[GUIObject: %s]", e->GetName().c_str()); - buffer[255] = 0; - rec.rval().setString(JS_NewStringCopyZ(cx, buffer)); + ScriptInterface::ToJSVal(cx, rec.rval(), "[GUIObject: " + e->GetName() + "]"); return true; }