Remove unused nParamNum values from JS method tables.

fpdfsdk/src/javascript/Document.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
@@ skipping 80 matching lines @@
         JS_STATIC_PROP_ENTRY(pageWindowRect)
         JS_STATIC_PROP_ENTRY(path)
         JS_STATIC_PROP_ENTRY(producer)
         JS_STATIC_PROP_ENTRY(subject)
         JS_STATIC_PROP_ENTRY(title)
         JS_STATIC_PROP_ENTRY(zoom)
         JS_STATIC_PROP_ENTRY(zoomType)
 END_JS_STATIC_PROP()
 
 BEGIN_JS_STATIC_METHOD(CJS_Document)
-        JS_STATIC_METHOD_ENTRY(addAnnot,0)
-        JS_STATIC_METHOD_ENTRY(addField, 4)
-        JS_STATIC_METHOD_ENTRY(addLink, 0)
-        JS_STATIC_METHOD_ENTRY(addIcon, 0)
-        JS_STATIC_METHOD_ENTRY(calculateNow, 0)
-        JS_STATIC_METHOD_ENTRY(closeDoc, 0)
-        JS_STATIC_METHOD_ENTRY(createDataObject, 0)
-        JS_STATIC_METHOD_ENTRY(deletePages, 2)
-        JS_STATIC_METHOD_ENTRY(exportAsText, 3)
-        JS_STATIC_METHOD_ENTRY(exportAsFDF, 6)
-        JS_STATIC_METHOD_ENTRY(exportAsXFDF, 5)
-        JS_STATIC_METHOD_ENTRY(extractPages, 3)
-        JS_STATIC_METHOD_ENTRY(getAnnot, 0)
-        JS_STATIC_METHOD_ENTRY(getAnnots, 2)
-        JS_STATIC_METHOD_ENTRY(getAnnot3D, 2)
-        JS_STATIC_METHOD_ENTRY(getAnnots3D, 1)
-        JS_STATIC_METHOD_ENTRY(getField, 1)
-        JS_STATIC_METHOD_ENTRY(getIcon, 0)
-        JS_STATIC_METHOD_ENTRY(getLinks, 0)
-        JS_STATIC_METHOD_ENTRY(getNthFieldName, 1)
-        JS_STATIC_METHOD_ENTRY(getOCGs, 0)
-        JS_STATIC_METHOD_ENTRY(getPageBox, 0)
-        JS_STATIC_METHOD_ENTRY(getPageNthWord, 3)
-        JS_STATIC_METHOD_ENTRY(getPageNthWordQuads, 2)
-        JS_STATIC_METHOD_ENTRY(getPageNumWords, 1)
-        JS_STATIC_METHOD_ENTRY(getPrintParams, 0)
-        JS_STATIC_METHOD_ENTRY(getURL, 2)
-        JS_STATIC_METHOD_ENTRY(importAnFDF, 1)
-        JS_STATIC_METHOD_ENTRY(importAnXFDF, 1)
-        JS_STATIC_METHOD_ENTRY(importTextData, 2)
-        JS_STATIC_METHOD_ENTRY(insertPages, 4)
-        JS_STATIC_METHOD_ENTRY(mailForm, 6)
-        JS_STATIC_METHOD_ENTRY(print, 9)
-        JS_STATIC_METHOD_ENTRY(removeField, 1)
-        JS_STATIC_METHOD_ENTRY(replacePages, 4)
-        JS_STATIC_METHOD_ENTRY(resetForm, 1)
-        JS_STATIC_METHOD_ENTRY(removeIcon, 0)
-        JS_STATIC_METHOD_ENTRY(saveAs, 5)
-        JS_STATIC_METHOD_ENTRY(submitForm, 23)
-        JS_STATIC_METHOD_ENTRY(mailDoc, 0)
+        JS_STATIC_METHOD_ENTRY(addAnnot)
+        JS_STATIC_METHOD_ENTRY(addField)
+        JS_STATIC_METHOD_ENTRY(addLink)
+        JS_STATIC_METHOD_ENTRY(addIcon)
+        JS_STATIC_METHOD_ENTRY(calculateNow)
+        JS_STATIC_METHOD_ENTRY(closeDoc)
+        JS_STATIC_METHOD_ENTRY(createDataObject)
+        JS_STATIC_METHOD_ENTRY(deletePages)
+        JS_STATIC_METHOD_ENTRY(exportAsText)
+        JS_STATIC_METHOD_ENTRY(exportAsFDF)
+        JS_STATIC_METHOD_ENTRY(exportAsXFDF)
+        JS_STATIC_METHOD_ENTRY(extractPages)
+        JS_STATIC_METHOD_ENTRY(getAnnot)
+        JS_STATIC_METHOD_ENTRY(getAnnots)
+        JS_STATIC_METHOD_ENTRY(getAnnot3D)
+        JS_STATIC_METHOD_ENTRY(getAnnots3D)
+        JS_STATIC_METHOD_ENTRY(getField)
+        JS_STATIC_METHOD_ENTRY(getIcon)
+        JS_STATIC_METHOD_ENTRY(getLinks)
+        JS_STATIC_METHOD_ENTRY(getNthFieldName)
+        JS_STATIC_METHOD_ENTRY(getOCGs)
+        JS_STATIC_METHOD_ENTRY(getPageBox)
+        JS_STATIC_METHOD_ENTRY(getPageNthWord)
+        JS_STATIC_METHOD_ENTRY(getPageNthWordQuads)
+        JS_STATIC_METHOD_ENTRY(getPageNumWords)
+        JS_STATIC_METHOD_ENTRY(getPrintParams)
+        JS_STATIC_METHOD_ENTRY(getURL)
+        JS_STATIC_METHOD_ENTRY(importAnFDF)
+        JS_STATIC_METHOD_ENTRY(importAnXFDF)
+        JS_STATIC_METHOD_ENTRY(importTextData)
+        JS_STATIC_METHOD_ENTRY(insertPages)
+        JS_STATIC_METHOD_ENTRY(mailForm)
+        JS_STATIC_METHOD_ENTRY(print)
+        JS_STATIC_METHOD_ENTRY(removeField)
+        JS_STATIC_METHOD_ENTRY(replacePages)
+        JS_STATIC_METHOD_ENTRY(resetForm)
+        JS_STATIC_METHOD_ENTRY(removeIcon)
+        JS_STATIC_METHOD_ENTRY(saveAs)
+        JS_STATIC_METHOD_ENTRY(submitForm)
+        JS_STATIC_METHOD_ENTRY(mailDoc)
 END_JS_STATIC_METHOD()
 
 IMPLEMENT_JS_CLASS(CJS_Document, Document)
 
 FX_BOOL CJS_Document::InitInstance(IFXJS_Context* cc)
 {
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
 
         Document* pDoc = (Document*)GetEmbedObject();
@@ skipping 163 matching lines @@
         // Unsafe, not supported.
         return TRUE;
 }
 
 //Maps a field object in PDF document to a JavaScript variable
 //comment:
 //note: the paremter cName, this is clue how to treat if the cName is not a valiable filed name in this document
 
 FX_BOOL Document::getField(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
-        v8::Isolate* isolate = GetIsolate(cc);
-        ASSERT(m_pDocument != NULL);
-
-        if (params.size() < 1) return FALSE;
+        CJS_Context* pContext = (CJS_Context*)cc;
+        if (params.size() < 1) {
+                sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
+                return FALSE;
+        }
 
         CFX_WideString wideName = params[0].ToCFXWideString();
 
         CPDFSDK_InterForm* pInterForm = m_pDocument->GetInterForm();
-        ASSERT(pInterForm != NULL);
-
         CPDF_InterForm* pPDFForm = pInterForm->GetInterForm();
-        ASSERT(pPDFForm != NULL);
-
         if (pPDFForm->CountFields(wideName) <= 0)
         {
                 vRet.SetNull();
                 return TRUE;
         }
 
-        CJS_Context* pContext = (CJS_Context*)cc;
-        ASSERT(pContext != NULL);
         CJS_Runtime* pRuntime = pContext->GetJSRuntime();
-        ASSERT(pRuntime != NULL);
+        JSFXObject pFieldObj = JS_NewFxDynamicObj(*pRuntime, pContext, JS_GetObjDefnID(*pRuntime, L"Field"));
 
-        JSFXObject  pFieldObj = JS_NewFxDynamicObj(*pRuntime, pContext, JS_GetObjDefnID(*pRuntime, L"Field"));
+        v8::Isolate* isolate = GetIsolate(cc);
+        CJS_Field* pJSField = (CJS_Field*)JS_GetPrivate(isolate,pFieldObj);
+        Field* pField = (Field *)pJSField->GetEmbedObject();
+        pField->AttachField(this, wideName);
 
-        CJS_Field * pJSField = (CJS_Field*)JS_GetPrivate(isolate,pFieldObj);
-        ASSERT(pJSField != NULL);
-
-        Field * pField = (Field *)pJSField->GetEmbedObject();
-        ASSERT(pField != NULL);
-
-        pField->AttachField(this, wideName);
         vRet = pJSField;
-
         return TRUE;
 }
 
 //Gets the name of the nth field in the document
 FX_BOOL Document::getNthFieldName(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
-        ASSERT(m_pDocument != NULL);
+        CJS_Context* pContext = (CJS_Context*)cc;
+        if (params.size() != 1) {
+                sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
+                return FALSE;
+        }
 
-        int nIndex = params.size() > 0 ? params[0].ToInt() : -1;
-        if (nIndex == -1) return FALSE;
+        int nIndex = params[0].ToInt();
+        if (nIndex < 0) {
+                sError = JSGetStringFromID(pContext, IDS_STRING_JSVALUEERROR);
+                return FALSE;
+        }
 
         CPDFSDK_InterForm* pInterForm = m_pDocument->GetInterForm();
-        ASSERT(pInterForm != NULL);
-
         CPDF_InterForm* pPDFForm = pInterForm->GetInterForm();
-        ASSERT(pPDFForm != NULL);
-
         CPDF_FormField* pField = pPDFForm->GetField(nIndex);
         if (!pField)
                 return FALSE;
 
         vRet = pField->GetFullName();
         return TRUE;
 }
 
 FX_BOOL Document::importAnFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
@@ skipping 130 matching lines @@
 //comment:
 //note: if the filed name is not retional, adobe is dumb for it.
 
 FX_BOOL Document::removeField(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         if (!(m_pDocument->GetPermissions(FPDFPERM_MODIFY) ||
                 m_pDocument->GetPermissions(FPDFPERM_ANNOT_FORM))) return FALSE;
 
-        if (params.size() < 1)
-                return TRUE;
+        CJS_Context* pContext = (CJS_Context*)cc;
+        if (params.size() != 1) {
+                sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
+                return FALSE;
+        }
 
         CFX_WideString sFieldName = params[0].ToCFXWideString();
-
         CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)m_pDocument->GetInterForm();
         ASSERT(pInterForm != NULL);
 
         CFX_PtrArray widgets;
         pInterForm->GetWidgets(sFieldName, widgets);
 
         int nSize = widgets.GetSize();
 
         if (nSize > 0)
         {
@@ skipping 93 matching lines @@
 FX_BOOL Document::saveAs(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
   // Unsafe, not supported.
   return TRUE;
 }
 
 
 FX_BOOL Document::submitForm(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
-
-//      if (!m_pDocument->GetPermissions(FPDFPERM_EXTRACT_ACCESS)) return FALSE;
-
+        CJS_Context* pContext = (CJS_Context*)cc;

[brucedawson, 2015/05/01 17:16:36]

This newly added pContext variable now shadows two identical declarations and
initializations in two inner scopes of this function. Around line 686 and 724 of
this file.

There is no bug, but the variable shadowing adds some confusion and should
probably be corrected.

This was found by /analyze in build 163.

         int nSize = params.size();
-        if (nSize < 1) return FALSE;
+        if (nSize < 1) {
+                sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
+                return FALSE;
+        }
 
         CFX_WideString strURL;
         FX_BOOL bFDF = TRUE;
         FX_BOOL bEmpty = FALSE;
         v8::Isolate* isolate = GetIsolate(cc);
         CJS_Array aFields(isolate);
 
         CJS_Value v = params[0];
         if (v.GetType() == VT_string)
         {
@@ skipping 791 matching lines @@
 
                         continue;
                 }
 
                 pTemp = pTemp->NextIcon;
         }
 }
 
 FX_BOOL Document::addIcon(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
-        if (params.size() != 2)return FALSE;
-
         CJS_Context* pContext = (CJS_Context*)cc;
-        ASSERT(pContext != NULL);
-        CJS_Runtime* pRuntime = pContext->GetJSRuntime();
-        ASSERT(pRuntime != NULL);
+        if (params.size() != 2) {
+                sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
+                return FALSE;
+        }
 
         CFX_WideString swIconName = params[0].ToCFXWideString();
+        JSFXObject pJSIcon = params[1].ToV8Object();
 
-        JSFXObject pJSIcon = params[1].ToV8Object();
-        if (JS_GetObjDefnID(pJSIcon) != JS_GetObjDefnID(*pRuntime, L"Icon")) return FALSE;
+        CJS_Runtime* pRuntime = pContext->GetJSRuntime();
+        if (JS_GetObjDefnID(pJSIcon) != JS_GetObjDefnID(*pRuntime, L"Icon")) {
+                sError = JSGetStringFromID(pContext, IDS_STRING_JSTYPEERROR);
+                return FALSE;
+        }
 
         CJS_EmbedObj* pEmbedObj = params[1].ToCJSObject()->GetEmbedObject();
-        if (!pEmbedObj)return FALSE;
+        if (!pEmbedObj) {
+                sError = JSGetStringFromID(pContext, IDS_STRING_JSTYPEERROR);
+                return FALSE;
+        }
+
         Icon* pIcon = (Icon*)pEmbedObj;
-
         if (!m_pIconTree)
                 m_pIconTree = new IconTree();
 
         IconElement* pNewIcon = new IconElement();
         pNewIcon->IconName = swIconName;
         pNewIcon->NextIcon = NULL;
         pNewIcon->IconStream = pIcon;
         m_pIconTree->InsertIconElement(pNewIcon);
         return TRUE;
 }
@@ skipping 36 matching lines @@
                 pIcon->SetIconName(pIconElement->IconName);
                 Icons.SetElement(i, CJS_Value(m_isolate,pJS_Icon));
         }
 
         vp << Icons;
         return TRUE;
 }
 
 FX_BOOL Document::getIcon(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
-        if (params.size() != 1)return FALSE;
+        CJS_Context* pContext = (CJS_Context *)cc;
+        if (params.size() != 1) {
+                sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
+                return FALSE;
+        }
+
         if(!m_pIconTree)
                 return FALSE;
         CFX_WideString swIconName = params[0].ToCFXWideString();
         int iIconCounts = m_pIconTree->GetLength();
 
-        CJS_Context* pContext = (CJS_Context *)cc;
         CJS_Runtime* pRuntime = pContext->GetJSRuntime();
 
         for (int i = 0; i < iIconCounts; i++)
         {
                 if ((*m_pIconTree)[i]->IconName == swIconName)
                 {
                         Icon* pRetIcon = (*m_pIconTree)[i]->IconStream;
 
                         JSFXObject  pObj = JS_NewFxDynamicObj(*pRuntime, pContext, JS_GetObjDefnID(*pRuntime, L"Icon"));
                         if (pObj.IsEmpty()) return FALSE;
 
                         CJS_Icon * pJS_Icon = (CJS_Icon *)JS_GetPrivate(pObj);
                         if (!pJS_Icon) return FALSE;
 
                         Icon* pIcon = (Icon*)pJS_Icon->GetEmbedObject();
                         if (!pIcon)return FALSE;
 
                         pIcon->SetIconName(swIconName);
                         pIcon->SetStream(pRetIcon->GetStream());
                         vRet = pJS_Icon;
                         return TRUE;
                 }
         }
 
         return FALSE;
 }
 
 FX_BOOL Document::removeIcon(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
-        if (params.size() != 1)return FALSE;
+        CJS_Context* pContext = (CJS_Context *)cc;
+        if (params.size() != 1) {
+                sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
+                return FALSE;
+        }
+
         if(!m_pIconTree)
                 return FALSE;
         CFX_WideString swIconName = params[0].ToCFXWideString();
         return TRUE;
 }
 
 FX_BOOL Document::createDataObject(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
   // Unsafe, not implemented.
   return TRUE;
@@ skipping 29 matching lines @@
 
         if (!m_pDocument->GetPermissions(FPDFPERM_EXTRACT_ACCESS)) return FALSE;
 
         int nPageNo = params.GetSize() > 0 ? params[0].ToInt() : 0;
         int nWordNo = params.GetSize() > 1 ? params[1].ToInt() : 0;
         bool bStrip = params.GetSize() > 2 ? params[2].ToBool() : true;
 
         CPDF_Document* pDocument = m_pDocument->GetDocument();
         if (!pDocument) return FALSE;
 
+        CJS_Context* pContext = static_cast<CJS_Context*>(cc);
         if (nPageNo < 0 || nPageNo >= pDocument->GetPageCount())
         {
-                CJS_Context* pContext = static_cast<CJS_Context*>(cc);
-                sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
+                sError = JSGetStringFromID(pContext, IDS_STRING_JSVALUEERROR);
                 return FALSE;
         }
 
         CPDF_Dictionary* pPageDict = pDocument->GetPage(nPageNo);
         if (!pPageDict) return FALSE;
 
         CPDF_Page page;
         page.Load(pDocument, pPageDict);
         page.StartParse();
         page.ParseContent();
@@ skipping 46 matching lines @@
 {
         ASSERT(m_pDocument != NULL);
 
         if (!m_pDocument->GetPermissions(FPDFPERM_EXTRACT_ACCESS)) return FALSE;
 
         int nPageNo = params.GetSize() > 0 ? params[0].ToInt() : 0;
 
         CPDF_Document* pDocument = m_pDocument->GetDocument();
         ASSERT(pDocument != NULL);
 
+        CJS_Context* pContext = static_cast<CJS_Context*>(cc);
         if (nPageNo < 0 || nPageNo >= pDocument->GetPageCount())
         {
-                CJS_Context* pContext = static_cast<CJS_Context*>(cc);
-                sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
+                sError = JSGetStringFromID(pContext, IDS_STRING_JSVALUEERROR);
                 return FALSE;
         }
 
         CPDF_Dictionary* pPageDict = pDocument->GetPage(nPageNo);
         if (!pPageDict) return FALSE;
 
         CPDF_Page page;
         page.Load(pDocument, pPageDict);
         page.StartParse();
         page.ParseContent();
@@ skipping 15 matching lines @@
         }
 
         vRet = nWords;
 
         return TRUE;
 }
 
 FX_BOOL Document::getPrintParams(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         CJS_Context* pContext = (CJS_Context*)cc;
-        ASSERT(pContext != NULL);
         CJS_Runtime* pRuntime = pContext->GetJSRuntime();
-        ASSERT(pRuntime != NULL);
         JSFXObject pRetObj = JS_NewFxDynamicObj(*pRuntime, pContext, JS_GetObjDefnID(*pRuntime, L"PrintParamsObj"));
-        //not implemented yet.
+
+        // Not implemented yet.
+
         vRet = pRetObj;
-
         return TRUE;
 }
 
 #define ISLATINWORD(u)  (u != 0x20 && u <= 0x28FF)
 
 int     Document::CountWords(CPDF_TextObject* pTextObj)
 {
         if (!pTextObj) return 0;
 
         int nWords = 0;
@@ skipping 207 matching lines @@
         {
                 m_DelayData.RemoveAt(DelArray[j]);
         }
 }
 
 CJS_Document* Document::GetCJSDoc() const 
 {
         return static_cast<CJS_Document*>(m_pJSObject);
 }