From 909fa2daa49e5439c595e3d17a76f0e05d7934b0 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 12 Dec 2017 01:53:28 +0000 Subject: [js] Convert to using size instead of sentinels This CL changes the DefineMethod, DefineProps and DefineConsts methods to pass a size instead of depending on a sentinel value in the definition arrays. Change-Id: Ie054544124290c0833a8b21af175a203ca99591a Reviewed-on: https://pdfium-review.googlesource.com/20551 Commit-Queue: dsinclair Reviewed-by: Lei Zhang --- fxjs/cjs_util.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'fxjs/cjs_util.cpp') diff --git a/fxjs/cjs_util.cpp b/fxjs/cjs_util.cpp index c7bf027695..57267ad418 100644 --- a/fxjs/cjs_util.cpp +++ b/fxjs/cjs_util.cpp @@ -58,9 +58,11 @@ const TbConvert TbConvertTable[] = { } // namespace const JSMethodSpec CJS_Util::MethodSpecs[] = { - {"printd", printd_static}, {"printf", printf_static}, - {"printx", printx_static}, {"scand", scand_static}, - {"byteToChar", byteToChar_static}, {0, 0}}; + {"printd", printd_static}, + {"printf", printf_static}, + {"printx", printx_static}, + {"scand", scand_static}, + {"byteToChar", byteToChar_static}}; int CJS_Util::ObjDefnID = -1; @@ -69,7 +71,7 @@ void CJS_Util::DefineJSObjects(CFXJS_Engine* pEngine) { ObjDefnID = pEngine->DefineObj("util", FXJSOBJTYPE_STATIC, JSConstructor, JSDestructor); - DefineMethods(pEngine, ObjDefnID, MethodSpecs); + DefineMethods(pEngine, ObjDefnID, MethodSpecs, FX_ArraySize(MethodSpecs)); } util::util(CJS_Object* pJSObject) : CJS_EmbedObj(pJSObject) {} -- cgit v1.2.3