Review and cleanup lint warnings.

core/src/fxcrt/fx_basic_bstring.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 <stddef.h>  // For offsetof().
+#include <stddef.h>
+
 #include <cctype>
 
 #include "core/include/fxcrt/fx_basic.h"
 #include "third_party/base/numerics/safe_math.h"
 
 static int _Buffer_itoa(char* buf, int i, FX_DWORD flags) {
   if (i == 0) {
     buf[0] = '0';
     return 1;
   }
   char buf1[32];
   int buf_pos = 31;
   FX_DWORD u = i;
   if ((flags & FXFORMAT_SIGNED) && i < 0) {
     u = -i;
   }
   int base = 10;
-  const FX_CHAR* string = "0123456789abcdef";
+  const FX_CHAR* str = "0123456789abcdef";
   if (flags & FXFORMAT_HEX) {
     base = 16;
     if (flags & FXFORMAT_CAPITAL) {
-      string = "0123456789ABCDEF";
+      str = "0123456789ABCDEF";
     }
   }
   while (u != 0) {
-    buf1[buf_pos--] = string[u % base];
+    buf1[buf_pos--] = str[u % base];
     u = u / base;
   }
   if ((flags & FXFORMAT_SIGNED) && i < 0) {
     buf1[buf_pos--] = '-';
   }
   int len = 31 - buf_pos;
   for (int ii = 0; ii < len; ii++) {
     buf[ii] = buf1[ii + buf_pos + 1];
   }
   return len;
@@ skipping 151 matching lines @@
 const CFX_ByteString& CFX_ByteString::operator+=(const FX_CHAR* lpsz) {
   if (lpsz) {
     ConcatInPlace(FXSYS_strlen(lpsz), lpsz);
   }
   return *this;
 }
 const CFX_ByteString& CFX_ByteString::operator+=(char ch) {
   ConcatInPlace(1, &ch);
   return *this;
 }
-const CFX_ByteString& CFX_ByteString::operator+=(const CFX_ByteString& string) {
-  if (!string.m_pData) {
+const CFX_ByteString& CFX_ByteString::operator+=(const CFX_ByteString& str) {
+  if (!str.m_pData) {
     return *this;
   }
-  ConcatInPlace(string.m_pData->m_nDataLength, string.m_pData->m_String);
+  ConcatInPlace(str.m_pData->m_nDataLength, str.m_pData->m_String);
   return *this;
 }
-const CFX_ByteString& CFX_ByteString::operator+=(
-    const CFX_ByteStringC& string) {
-  if (string.IsEmpty()) {
+const CFX_ByteString& CFX_ByteString::operator+=(const CFX_ByteStringC& str) {
+  if (str.IsEmpty()) {
     return *this;
   }
-  ConcatInPlace(string.GetLength(), string.GetCStr());
+  ConcatInPlace(str.GetLength(), str.GetCStr());
   return *this;
 }
 bool CFX_ByteString::Equal(const char* ptr) const {
   if (!m_pData) {
     return !ptr || ptr[0] == '\0';
   }
   if (!ptr) {
     return m_pData->m_nDataLength == 0;
   }
   return FXSYS_strlen(ptr) == m_pData->m_nDataLength &&
@@ skipping 851 matching lines @@
     fraction %= scale;
     scale /= 10;
   }
   return buf_size;
 }
 CFX_ByteString CFX_ByteString::FormatFloat(FX_FLOAT d, int precision) {
   FX_CHAR buf[32];
   FX_STRSIZE len = FX_ftoa(d, buf);
   return CFX_ByteString(buf, len);
 }