From e0e922db5fb77df9a5a9cc802096f484ed21da1c Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 3 Nov 2015 14:54:35 -0500 Subject: Revert "Revert "Cleanup some numeric code."" This reverts commit 23d576f0b498bd4f37ef2175916223a2e5ea0324. Cleanup some numeric code. This changes the various comparisons of char >= '0' && char <= '9' and char < '0' || char > '9' to use std::isdigit checks. It also cleans up a handful of hex to digit conversions to call one common method. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1405253007 . --- core/src/fxcrt/fx_basic_bstring.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'core/src/fxcrt/fx_basic_bstring.cpp') diff --git a/core/src/fxcrt/fx_basic_bstring.cpp b/core/src/fxcrt/fx_basic_bstring.cpp index c706912d9d..1b9d7a0344 100644 --- a/core/src/fxcrt/fx_basic_bstring.cpp +++ b/core/src/fxcrt/fx_basic_bstring.cpp @@ -5,6 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include // For offsetof(). +#include #include "../../include/fxcrt/fx_basic.h" #include "../../../third_party/base/numerics/safe_math.h" @@ -493,8 +494,8 @@ void CFX_ByteString::FormatV(const FX_CHAR* lpszFormat, va_list argList) { } if (nWidth == 0) { nWidth = FXSYS_atoi(lpsz); - for (; (*lpsz) >= '0' && (*lpsz) <= '9'; lpsz++) - ; + while (std::isdigit(*lpsz)) + lpsz++; } if (nWidth < 0 || nWidth > 128 * 1024) { lpszFormat = "Bad width"; @@ -509,8 +510,8 @@ void CFX_ByteString::FormatV(const FX_CHAR* lpszFormat, va_list argList) { lpsz++; } else { nPrecision = FXSYS_atoi(lpsz); - for (; (*lpsz) >= '0' && (*lpsz) <= '9'; lpsz++) - ; + while (std::isdigit(*lpsz)) + lpsz++; } } if (nPrecision < 0 || nPrecision > 128 * 1024) { -- cgit v1.2.3