diff options
author | Devin Nakamura <devinn@ca.ibm.com> | 2018-07-13 17:55:39 (GMT) |
---|---|---|
committer | Devin Nakamura <devinn@ca.ibm.com> | 2018-07-13 17:55:39 (GMT) |
commit | 5f431789a9b7dfcd3e350d08fb71521999d2be5c (patch) | |
tree | e617be01ec9801197f9596da3bb3425815504d3b /Source/cmHexFileConverter.cxx | |
parent | bfb025f04b3522ff0fee650e7c4c4fe808d739b3 (diff) | |
download | CMake-5f431789a9b7dfcd3e350d08fb71521999d2be5c.zip CMake-5f431789a9b7dfcd3e350d08fb71521999d2be5c.tar.gz CMake-5f431789a9b7dfcd3e350d08fb71521999d2be5c.tar.bz2 |
Use isxdigit() to determine if a character is a hex digit
Replace custom cm_IsHexChar with isxdigit from the stdlib
Diffstat (limited to 'Source/cmHexFileConverter.cxx')
-rw-r--r-- | Source/cmHexFileConverter.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Source/cmHexFileConverter.cxx b/Source/cmHexFileConverter.cxx index 8deb8c1..4e29f39 100644 --- a/Source/cmHexFileConverter.cxx +++ b/Source/cmHexFileConverter.cxx @@ -2,6 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmHexFileConverter.h" +#include <ctype.h> #include <stdio.h> #include <string.h> @@ -12,13 +13,6 @@ #define MOTOROLA_SREC_MIN_LINE_LENGTH (2 + 2 + 4 + 2) #define MOTOROLA_SREC_MAX_LINE_LENGTH (2 + 2 + 8 + (256 * 2) + 2) -// might go to SystemTools ? -static bool cm_IsHexChar(char c) -{ - return (((c >= '0') && (c <= '9')) || ((c >= 'a') && (c <= 'f')) || - ((c >= 'A') && (c <= 'F'))); -} - static unsigned int ChompStrlen(const char* line) { if (line == nullptr) { @@ -169,7 +163,7 @@ cmHexFileConverter::FileType cmHexFileConverter::DetermineFileType( } for (unsigned int i = 1; i < slen; i++) { - if (!cm_IsHexChar(buf[i])) { + if (!isxdigit(buf[i])) { return Binary; } } |