diff options
Diffstat (limited to 'libutils')
| -rw-r--r-- | libutils/Unicode.cpp | 4 | ||||
| -rw-r--r-- | libutils/include/utils/Vector.h | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/libutils/Unicode.cpp b/libutils/Unicode.cpp index b08e061c0f..b6e457b04c 100644 --- a/libutils/Unicode.cpp +++ b/libutils/Unicode.cpp @@ -162,9 +162,9 @@ int32_t utf32_from_utf8_at(const char *src, size_t src_len, size_t index, size_t if (index >= src_len) { return -1; } - size_t dummy_index; + size_t unused_index; if (next_index == nullptr) { - next_index = &dummy_index; + next_index = &unused_index; } size_t num_read; int32_t ret = utf32_at_internal(src + index, &num_read); diff --git a/libutils/include/utils/Vector.h b/libutils/include/utils/Vector.h index ddf71de240..be35ea2f04 100644 --- a/libutils/include/utils/Vector.h +++ b/libutils/include/utils/Vector.h @@ -23,15 +23,13 @@ #include <log/log.h> #include <utils/TypeHelpers.h> #include <utils/VectorImpl.h> - -/* - * Used to blacklist some functions from CFI. - * - */ #ifndef __has_attribute #define __has_attribute(x) 0 #endif +/* + * Used to exclude some functions from CFI. + */ #if __has_attribute(no_sanitize) #define UTILS_VECTOR_NO_CFI __attribute__((no_sanitize("cfi"))) #else |