Tidy up JS_Defines.h

fpdfsdk/src/javascript/util.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 119 matching lines @@
                         {
                                 continue;
                         }
                         else break;
                 }
         }
 
         return -1;
 }
 
-FX_BOOL util::printf(OBJ_METHOD_PARAMS)
+FX_BOOL util::printf(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError)
 {
         int iSize = params.size();
         if (iSize < 1)
                 return FALSE;
         std::wstring  c_ConvChar((const wchar_t*)(FX_LPCWSTR)params[0].operator CFX_WideString());
         std::vector<std::wstring> c_strConvers;
         int iOffset = 0;
         int iOffend = 0;
         c_ConvChar.insert(c_ConvChar.begin(),L'S');
         while(iOffset != -1)
@@ skipping 44 matching lines @@
                                 break;
                 }
                 c_strResult += strSegment.GetBuffer(strSegment.GetLength()+1);
         }
 
         c_strResult.erase(c_strResult.begin());
         vRet = c_strResult.c_str();
         return TRUE;
 }
 
-FX_BOOL util::printd(OBJ_METHOD_PARAMS)
+FX_BOOL util::printd(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError)
 {
         v8::Isolate* isolate = GetIsolate(cc);
 
         int iSize = params.size();
         if (iSize < 2)
                 return FALSE;
 
         CJS_Value p1(isolate);
         p1 = params[0];
 
@@ skipping 241 matching lines @@
 
                 CFX_WideString strFormat;
 //              strFormat.Format(L"%d,%d,%d,%d,%d,%d",iYear, iMonth, iDay, iHour, iMin, iSec);
 //              CString strFormat = cppTm.Format(cFormat.c_str());
                 wchar_t buf[64] = {0};
                 strFormat = wcsftime(buf, 64, cFormat.c_str(), &time);
                 cFormat = buf;
                 cPurpose = cFormat;
 }
 
-FX_BOOL util::printx(OBJ_METHOD_PARAMS)
+FX_BOOL util::printx(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError)
 {
         int iSize = params.size();
         if (iSize<2)
                 return FALSE;
         CFX_WideString sFormat = params[0].operator CFX_WideString();
         CFX_WideString sSource = params[1].operator CFX_WideString();
         std::string cFormat = CFX_ByteString::FromUnicode(sFormat).c_str();
         std::string cSource = CFX_ByteString::FromUnicode(sSource).c_str();
         std::string cDest;
         printx(cFormat,cSource,cDest);
@@ skipping 93 matching lines @@
                 case '=':
                         break;
                 default:
                         //cPurpose.push_back(letter);
                         cPurpose += letter;
                         break;
                 }
         }
 }
 
-FX_BOOL util::scand(OBJ_METHOD_PARAMS)
+FX_BOOL util::scand(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError)
 {
         v8::Isolate* isolate = GetIsolate(cc);
         int iSize = params.size();
         if (iSize < 2)
                 return FALSE;
         CFX_WideString sFormat = params[0].operator CFX_WideString();
         CFX_WideString sDate = params[1].operator CFX_WideString();
 
         double dDate = JS_GetDateTime();
         if (sDate.GetLength() > 0)
@@ skipping 36 matching lines @@
             total = 10 * total + (c - '0');     /* accumulate digit */
             c = (int)(unsigned char)*nptr++;    /* get next char */
         }
 
         if (sign == '-')
             return -total;
         else
             return total;   /* return result, negated if necessary */
 }
 
-FX_BOOL util::byteToChar(OBJ_METHOD_PARAMS)
+FX_BOOL util::byteToChar(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError)
 {
         int iSize = params.size();
         if (iSize == 0)
                 return FALSE;
         int nByte = (int)params[0];
         unsigned char cByte = (unsigned char)nByte;
         CFX_WideString csValue;
         csValue.Format(L"%c", cByte);
         vRet = csValue; 
         return TRUE;
 }