5 files changed, 10 insertions, 32 deletions
diff --git a/fpdfsdk/src/javascript/JS_Define.h b/fpdfsdk/src/javascript/JS_Define.h
index 3b45ea20a1..f03d9ec7fc 100644
--- a/fpdfsdk/src/javascript/JS_Define.h
+++ b/fpdfsdk/src/javascript/JS_Define.h
@@ -44,7 +44,7 @@ struct JSMethodSpec {
 #define END_JS_STATIC_CONST() \
   { 0, 0, 0, 0 }              \
   }                           \
-  ;
+  ;  // NOLINT
 
 #define BEGIN_JS_STATIC_PROP(js_class_name) \
   JSPropertySpec js_class_name::JS_Class_Properties[] = {
@@ -58,7 +58,7 @@ struct JSMethodSpec {
 #define END_JS_STATIC_PROP() \
   { 0, 0, 0 }                \
   }                          \
-  ;
+  ;  // NOLINT
 
 #define BEGIN_JS_STATIC_METHOD(js_class_name) \
   JSMethodSpec js_class_name::JS_Class_Methods[] = {
@@ -69,7 +69,7 @@ struct JSMethodSpec {
 #define END_JS_STATIC_METHOD() \
   { 0, 0 }                     \
   }                            \
-  ;
+  ;  // NOLINT
 
 template <class C,
           FX_BOOL (C::*M)(IJS_Context*, CJS_PropValue&, CFX_WideString&)>
diff --git a/fpdfsdk/src/javascript/JS_Value.cpp b/fpdfsdk/src/javascript/JS_Value.cpp
index 17b0d8738d..9f27387d1d 100644
--- a/fpdfsdk/src/javascript/JS_Value.cpp
+++ b/fpdfsdk/src/javascript/JS_Value.cpp
@@ -274,12 +274,6 @@ FX_BOOL CJS_Value::ConvertToArray(CJS_Array& array) const {
 }
 
 FX_BOOL CJS_Value::ConvertToDate(CJS_Date& date) const {
-  // 	if (GetType() == VT_date)
-  // 	{
-  // 		date = (double)(*this);
-  // 		return TRUE;
-  // 	}
-
   if (IsDateObject()) {
     date.Attach(m_pValue);
     return TRUE;
diff --git a/fpdfsdk/src/javascript/event.cpp b/fpdfsdk/src/javascript/event.cpp
index f0f52f77cc..f964908b9b 100644
--- a/fpdfsdk/src/javascript/event.cpp
+++ b/fpdfsdk/src/javascript/event.cpp
@@ -172,33 +172,18 @@ FX_BOOL event::richChange(IJS_Context* cc,
                           CJS_PropValue& vp,
                           CFX_WideString& sError) {
   return TRUE;
-  if (vp.IsSetting()) {
-  } else {
-    ;
-  }
-  return TRUE;
 }
 
 FX_BOOL event::richChangeEx(IJS_Context* cc,
                             CJS_PropValue& vp,
                             CFX_WideString& sError) {
   return TRUE;
-  if (vp.IsSetting()) {
-  } else {
-    ;
-  }
-  return TRUE;
 }
 
 FX_BOOL event::richValue(IJS_Context* cc,
                          CJS_PropValue& vp,
                          CFX_WideString& sError) {
   return TRUE;
-  if (vp.IsSetting()) {
-  } else {
-    ;
-  }
-  return TRUE;
 }
 
 FX_BOOL event::selEnd(IJS_Context* cc,
diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp
index e464339176..fdd67553fc 100644
--- a/fpdfsdk/src/javascript/global.cpp
+++ b/fpdfsdk/src/javascript/global.cpp
@@ -264,7 +264,6 @@ void JSGlobalAlternate::UpdateGlobalPersistentVariables() {
                            false, "", pObj, pData->bPersistent == 1);
         FXJS_PutObjectObject(NULL, m_pJSObject->ToV8Object(),
                              pData->data.sKey.UTF8Decode().c_str(), pObj);
-
       } break;
       case JS_GLOBALDATA_TYPE_NULL:
         SetGlobalVariables(pData->data.sKey, JS_GLOBALDATA_TYPE_NULL, 0, false,
diff --git a/fpdfsdk/src/javascript/util.cpp b/fpdfsdk/src/javascript/util.cpp
index fd08d49883..4bc28cd03a 100644
--- a/fpdfsdk/src/javascript/util.cpp
+++ b/fpdfsdk/src/javascript/util.cpp
@@ -53,23 +53,23 @@ const stru_TbConvert fcTable[] = {
     {L"mmmm", L"%B"},
     {L"mmm", L"%b"},
     {L"mm", L"%m"},
-    //"m"
+    // "m"
     {L"dddd", L"%A"},
     {L"ddd", L"%a"},
     {L"dd", L"%d"},
-    //"d",   "%w",
+    // "d",   "%w",
     {L"yyyy", L"%Y"},
     {L"yy", L"%y"},
     {L"HH", L"%H"},
-    //"H"
+    // "H"
     {L"hh", L"%I"},
-    //"h"
+    // "h"
     {L"MM", L"%M"},
-    //"M"
+    // "M"
     {L"ss", L"%S"},
-    //"s
+    // "s
     {L"TT", L"%p"},
-//"t"
+// "t"
 #if defined(_WIN32)
     {L"tt", L"%p"},
     {L"h", L"%#I"},