summaryrefslogtreecommitdiffstats
path: root/contrib/restricted/aws/aws-c-common/source/byte_buf.c
diff options
context:
space:
mode:
authorunril <[email protected]>2022-02-10 16:46:05 +0300
committerDaniil Cherednik <[email protected]>2022-02-10 16:46:05 +0300
commit11ae9eca250d0188b7962459cbc6706719e7dca9 (patch)
tree4b7d6755091980d33210de19b2eb35a401a761ea /contrib/restricted/aws/aws-c-common/source/byte_buf.c
parent9c914f41ba5e9f9365f404e892197553ac23809e (diff)
Restoring authorship annotation for <[email protected]>. Commit 1 of 2.
Diffstat (limited to 'contrib/restricted/aws/aws-c-common/source/byte_buf.c')
-rw-r--r--contrib/restricted/aws/aws-c-common/source/byte_buf.c1034
1 files changed, 517 insertions, 517 deletions
diff --git a/contrib/restricted/aws/aws-c-common/source/byte_buf.c b/contrib/restricted/aws/aws-c-common/source/byte_buf.c
index ca18f4121b8..4b2cf1d2797 100644
--- a/contrib/restricted/aws/aws-c-common/source/byte_buf.c
+++ b/contrib/restricted/aws/aws-c-common/source/byte_buf.c
@@ -1,71 +1,71 @@
/**
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0.
- */
-
-#include <aws/common/byte_buf.h>
+ */
+
+#include <aws/common/byte_buf.h>
#include <aws/common/private/byte_buf.h>
-
-#include <stdarg.h>
-
-#ifdef _MSC_VER
-/* disables warning non const declared initializers for Microsoft compilers */
-# pragma warning(disable : 4204)
-# pragma warning(disable : 4706)
-#endif
-
-int aws_byte_buf_init(struct aws_byte_buf *buf, struct aws_allocator *allocator, size_t capacity) {
+
+#include <stdarg.h>
+
+#ifdef _MSC_VER
+/* disables warning non const declared initializers for Microsoft compilers */
+# pragma warning(disable : 4204)
+# pragma warning(disable : 4706)
+#endif
+
+int aws_byte_buf_init(struct aws_byte_buf *buf, struct aws_allocator *allocator, size_t capacity) {
AWS_PRECONDITION(buf);
AWS_PRECONDITION(allocator);
-
- buf->buffer = (capacity == 0) ? NULL : aws_mem_acquire(allocator, capacity);
- if (capacity != 0 && buf->buffer == NULL) {
+
+ buf->buffer = (capacity == 0) ? NULL : aws_mem_acquire(allocator, capacity);
+ if (capacity != 0 && buf->buffer == NULL) {
AWS_ZERO_STRUCT(*buf);
- return AWS_OP_ERR;
- }
-
- buf->len = 0;
- buf->capacity = capacity;
- buf->allocator = allocator;
- AWS_POSTCONDITION(aws_byte_buf_is_valid(buf));
- return AWS_OP_SUCCESS;
-}
-
-int aws_byte_buf_init_copy(struct aws_byte_buf *dest, struct aws_allocator *allocator, const struct aws_byte_buf *src) {
+ return AWS_OP_ERR;
+ }
+
+ buf->len = 0;
+ buf->capacity = capacity;
+ buf->allocator = allocator;
+ AWS_POSTCONDITION(aws_byte_buf_is_valid(buf));
+ return AWS_OP_SUCCESS;
+}
+
+int aws_byte_buf_init_copy(struct aws_byte_buf *dest, struct aws_allocator *allocator, const struct aws_byte_buf *src) {
AWS_PRECONDITION(allocator);
AWS_PRECONDITION(dest);
AWS_ERROR_PRECONDITION(aws_byte_buf_is_valid(src));
-
- if (!src->buffer) {
- AWS_ZERO_STRUCT(*dest);
- dest->allocator = allocator;
- AWS_POSTCONDITION(aws_byte_buf_is_valid(dest));
- return AWS_OP_SUCCESS;
- }
-
- *dest = *src;
- dest->allocator = allocator;
- dest->buffer = (uint8_t *)aws_mem_acquire(allocator, src->capacity);
- if (dest->buffer == NULL) {
- AWS_ZERO_STRUCT(*dest);
- return AWS_OP_ERR;
- }
- memcpy(dest->buffer, src->buffer, src->len);
- AWS_POSTCONDITION(aws_byte_buf_is_valid(dest));
- return AWS_OP_SUCCESS;
-}
-
-bool aws_byte_buf_is_valid(const struct aws_byte_buf *const buf) {
+
+ if (!src->buffer) {
+ AWS_ZERO_STRUCT(*dest);
+ dest->allocator = allocator;
+ AWS_POSTCONDITION(aws_byte_buf_is_valid(dest));
+ return AWS_OP_SUCCESS;
+ }
+
+ *dest = *src;
+ dest->allocator = allocator;
+ dest->buffer = (uint8_t *)aws_mem_acquire(allocator, src->capacity);
+ if (dest->buffer == NULL) {
+ AWS_ZERO_STRUCT(*dest);
+ return AWS_OP_ERR;
+ }
+ memcpy(dest->buffer, src->buffer, src->len);
+ AWS_POSTCONDITION(aws_byte_buf_is_valid(dest));
+ return AWS_OP_SUCCESS;
+}
+
+bool aws_byte_buf_is_valid(const struct aws_byte_buf *const buf) {
return buf != NULL &&
((buf->capacity == 0 && buf->len == 0 && buf->buffer == NULL) ||
(buf->capacity > 0 && buf->len <= buf->capacity && AWS_MEM_IS_WRITABLE(buf->buffer, buf->capacity)));
-}
-
-bool aws_byte_cursor_is_valid(const struct aws_byte_cursor *cursor) {
+}
+
+bool aws_byte_cursor_is_valid(const struct aws_byte_cursor *cursor) {
return cursor != NULL &&
((cursor->len == 0) || (cursor->len > 0 && cursor->ptr && AWS_MEM_IS_READABLE(cursor->ptr, cursor->len)));
-}
-
+}
+
void aws_byte_buf_reset(struct aws_byte_buf *buf, bool zero_contents) {
if (zero_contents) {
aws_byte_buf_secure_zero(buf);
@@ -73,33 +73,33 @@ void aws_byte_buf_reset(struct aws_byte_buf *buf, bool zero_contents) {
buf->len = 0;
}
-void aws_byte_buf_clean_up(struct aws_byte_buf *buf) {
- AWS_PRECONDITION(aws_byte_buf_is_valid(buf));
- if (buf->allocator && buf->buffer) {
- aws_mem_release(buf->allocator, (void *)buf->buffer);
- }
- buf->allocator = NULL;
- buf->buffer = NULL;
- buf->len = 0;
- buf->capacity = 0;
-}
-
-void aws_byte_buf_secure_zero(struct aws_byte_buf *buf) {
+void aws_byte_buf_clean_up(struct aws_byte_buf *buf) {
+ AWS_PRECONDITION(aws_byte_buf_is_valid(buf));
+ if (buf->allocator && buf->buffer) {
+ aws_mem_release(buf->allocator, (void *)buf->buffer);
+ }
+ buf->allocator = NULL;
+ buf->buffer = NULL;
+ buf->len = 0;
+ buf->capacity = 0;
+}
+
+void aws_byte_buf_secure_zero(struct aws_byte_buf *buf) {
+ AWS_PRECONDITION(aws_byte_buf_is_valid(buf));
+ if (buf->buffer) {
+ aws_secure_zero(buf->buffer, buf->capacity);
+ }
+ buf->len = 0;
+ AWS_POSTCONDITION(aws_byte_buf_is_valid(buf));
+}
+
+void aws_byte_buf_clean_up_secure(struct aws_byte_buf *buf) {
AWS_PRECONDITION(aws_byte_buf_is_valid(buf));
- if (buf->buffer) {
- aws_secure_zero(buf->buffer, buf->capacity);
- }
- buf->len = 0;
+ aws_byte_buf_secure_zero(buf);
+ aws_byte_buf_clean_up(buf);
AWS_POSTCONDITION(aws_byte_buf_is_valid(buf));
-}
-
-void aws_byte_buf_clean_up_secure(struct aws_byte_buf *buf) {
- AWS_PRECONDITION(aws_byte_buf_is_valid(buf));
- aws_byte_buf_secure_zero(buf);
- aws_byte_buf_clean_up(buf);
- AWS_POSTCONDITION(aws_byte_buf_is_valid(buf));
-}
-
+}
+
bool aws_byte_buf_eq(const struct aws_byte_buf *const a, const struct aws_byte_buf *const b) {
AWS_PRECONDITION(aws_byte_buf_is_valid(a));
AWS_PRECONDITION(aws_byte_buf_is_valid(b));
@@ -107,8 +107,8 @@ bool aws_byte_buf_eq(const struct aws_byte_buf *const a, const struct aws_byte_b
AWS_POSTCONDITION(aws_byte_buf_is_valid(a));
AWS_POSTCONDITION(aws_byte_buf_is_valid(b));
return rval;
-}
-
+}
+
bool aws_byte_buf_eq_ignore_case(const struct aws_byte_buf *const a, const struct aws_byte_buf *const b) {
AWS_PRECONDITION(aws_byte_buf_is_valid(a));
AWS_PRECONDITION(aws_byte_buf_is_valid(b));
@@ -116,49 +116,49 @@ bool aws_byte_buf_eq_ignore_case(const struct aws_byte_buf *const a, const struc
AWS_POSTCONDITION(aws_byte_buf_is_valid(a));
AWS_POSTCONDITION(aws_byte_buf_is_valid(b));
return rval;
-}
-
+}
+
bool aws_byte_buf_eq_c_str(const struct aws_byte_buf *const buf, const char *const c_str) {
AWS_PRECONDITION(aws_byte_buf_is_valid(buf));
AWS_PRECONDITION(c_str != NULL);
bool rval = aws_array_eq_c_str(buf->buffer, buf->len, c_str);
AWS_POSTCONDITION(aws_byte_buf_is_valid(buf));
return rval;
-}
-
+}
+
bool aws_byte_buf_eq_c_str_ignore_case(const struct aws_byte_buf *const buf, const char *const c_str) {
AWS_PRECONDITION(aws_byte_buf_is_valid(buf));
AWS_PRECONDITION(c_str != NULL);
bool rval = aws_array_eq_c_str_ignore_case(buf->buffer, buf->len, c_str);
AWS_POSTCONDITION(aws_byte_buf_is_valid(buf));
return rval;
-}
-
-int aws_byte_buf_init_copy_from_cursor(
- struct aws_byte_buf *dest,
- struct aws_allocator *allocator,
- struct aws_byte_cursor src) {
+}
+
+int aws_byte_buf_init_copy_from_cursor(
+ struct aws_byte_buf *dest,
+ struct aws_allocator *allocator,
+ struct aws_byte_cursor src) {
AWS_PRECONDITION(allocator);
AWS_PRECONDITION(dest);
AWS_ERROR_PRECONDITION(aws_byte_cursor_is_valid(&src));
-
- AWS_ZERO_STRUCT(*dest);
-
- dest->buffer = (src.len > 0) ? (uint8_t *)aws_mem_acquire(allocator, src.len) : NULL;
- if (src.len != 0 && dest->buffer == NULL) {
- return AWS_OP_ERR;
- }
-
- dest->len = src.len;
- dest->capacity = src.len;
- dest->allocator = allocator;
- if (src.len > 0) {
- memcpy(dest->buffer, src.ptr, src.len);
- }
- AWS_POSTCONDITION(aws_byte_buf_is_valid(dest));
- return AWS_OP_SUCCESS;
-}
-
+
+ AWS_ZERO_STRUCT(*dest);
+
+ dest->buffer = (src.len > 0) ? (uint8_t *)aws_mem_acquire(allocator, src.len) : NULL;
+ if (src.len != 0 && dest->buffer == NULL) {
+ return AWS_OP_ERR;
+ }
+
+ dest->len = src.len;
+ dest->capacity = src.len;
+ dest->allocator = allocator;
+ if (src.len > 0) {
+ memcpy(dest->buffer, src.ptr, src.len);
+ }
+ AWS_POSTCONDITION(aws_byte_buf_is_valid(dest));
+ return AWS_OP_SUCCESS;
+}
+
int aws_byte_buf_init_cache_and_update_cursors(struct aws_byte_buf *dest, struct aws_allocator *allocator, ...) {
AWS_PRECONDITION(allocator);
AWS_PRECONDITION(dest);
@@ -193,16 +193,16 @@ int aws_byte_buf_init_cache_and_update_cursors(struct aws_byte_buf *dest, struct
return AWS_OP_SUCCESS;
}
-bool aws_byte_cursor_next_split(
- const struct aws_byte_cursor *AWS_RESTRICT input_str,
- char split_on,
- struct aws_byte_cursor *AWS_RESTRICT substr) {
-
+bool aws_byte_cursor_next_split(
+ const struct aws_byte_cursor *AWS_RESTRICT input_str,
+ char split_on,
+ struct aws_byte_cursor *AWS_RESTRICT substr) {
+
AWS_PRECONDITION(aws_byte_cursor_is_valid(input_str));
-
+
/* If substr is zeroed-out, then this is the first run. */
const bool first_run = substr->ptr == NULL;
-
+
/* It's legal for input_str to be zeroed out: {.ptr=NULL, .len=0}
* Deal with this case separately */
if (AWS_UNLIKELY(input_str->ptr == NULL)) {
@@ -212,14 +212,14 @@ bool aws_byte_cursor_next_split(
substr->len = 0;
return true;
}
-
+
/* done */
- AWS_ZERO_STRUCT(*substr);
- return false;
- }
-
+ AWS_ZERO_STRUCT(*substr);
+ return false;
+ }
+
/* Rest of function deals with non-NULL input_str->ptr */
-
+
if (first_run) {
*substr = *input_str;
} else {
@@ -235,64 +235,64 @@ bool aws_byte_cursor_next_split(
/* done */
AWS_ZERO_STRUCT(*substr);
return false;
- }
+ }
/* update len to be remainder of the string */
substr->len = input_str->len - (substr->ptr - input_str->ptr);
- }
-
+ }
+
/* substr is now remainder of string, search for next split */
- uint8_t *new_location = memchr(substr->ptr, split_on, substr->len);
- if (new_location) {
-
- /* Character found, update string length. */
- substr->len = new_location - substr->ptr;
- }
-
+ uint8_t *new_location = memchr(substr->ptr, split_on, substr->len);
+ if (new_location) {
+
+ /* Character found, update string length. */
+ substr->len = new_location - substr->ptr;
+ }
+
AWS_POSTCONDITION(aws_byte_cursor_is_valid(substr));
- return true;
-}
-
-int aws_byte_cursor_split_on_char_n(
- const struct aws_byte_cursor *AWS_RESTRICT input_str,
- char split_on,
- size_t n,
- struct aws_array_list *AWS_RESTRICT output) {
+ return true;
+}
+
+int aws_byte_cursor_split_on_char_n(
+ const struct aws_byte_cursor *AWS_RESTRICT input_str,
+ char split_on,
+ size_t n,
+ struct aws_array_list *AWS_RESTRICT output) {
AWS_ASSERT(aws_byte_cursor_is_valid(input_str));
- AWS_ASSERT(output);
- AWS_ASSERT(output->item_size >= sizeof(struct aws_byte_cursor));
-
- size_t max_splits = n > 0 ? n : SIZE_MAX;
- size_t split_count = 0;
-
- struct aws_byte_cursor substr;
- AWS_ZERO_STRUCT(substr);
-
- /* Until we run out of substrs or hit the max split count, keep iterating and pushing into the array list. */
- while (split_count <= max_splits && aws_byte_cursor_next_split(input_str, split_on, &substr)) {
-
- if (split_count == max_splits) {
- /* If this is the last split, take the rest of the string. */
- substr.len = input_str->len - (substr.ptr - input_str->ptr);
- }
-
- if (AWS_UNLIKELY(aws_array_list_push_back(output, (const void *)&substr))) {
- return AWS_OP_ERR;
- }
- ++split_count;
- }
-
- return AWS_OP_SUCCESS;
-}
-
-int aws_byte_cursor_split_on_char(
- const struct aws_byte_cursor *AWS_RESTRICT input_str,
- char split_on,
- struct aws_array_list *AWS_RESTRICT output) {
-
- return aws_byte_cursor_split_on_char_n(input_str, split_on, 0, output);
-}
-
+ AWS_ASSERT(output);
+ AWS_ASSERT(output->item_size >= sizeof(struct aws_byte_cursor));
+
+ size_t max_splits = n > 0 ? n : SIZE_MAX;
+ size_t split_count = 0;
+
+ struct aws_byte_cursor substr;
+ AWS_ZERO_STRUCT(substr);
+
+ /* Until we run out of substrs or hit the max split count, keep iterating and pushing into the array list. */
+ while (split_count <= max_splits && aws_byte_cursor_next_split(input_str, split_on, &substr)) {
+
+ if (split_count == max_splits) {
+ /* If this is the last split, take the rest of the string. */
+ substr.len = input_str->len - (substr.ptr - input_str->ptr);
+ }
+
+ if (AWS_UNLIKELY(aws_array_list_push_back(output, (const void *)&substr))) {
+ return AWS_OP_ERR;
+ }
+ ++split_count;
+ }
+
+ return AWS_OP_SUCCESS;
+}
+
+int aws_byte_cursor_split_on_char(
+ const struct aws_byte_cursor *AWS_RESTRICT input_str,
+ char split_on,
+ struct aws_array_list *AWS_RESTRICT output) {
+
+ return aws_byte_cursor_split_on_char_n(input_str, split_on, 0, output);
+}
+
int aws_byte_cursor_find_exact(
const struct aws_byte_cursor *AWS_RESTRICT input_str,
const struct aws_byte_cursor *AWS_RESTRICT to_find,
@@ -331,66 +331,66 @@ int aws_byte_cursor_find_exact(
return aws_raise_error(AWS_ERROR_STRING_MATCH_NOT_FOUND);
}
-int aws_byte_buf_cat(struct aws_byte_buf *dest, size_t number_of_args, ...) {
+int aws_byte_buf_cat(struct aws_byte_buf *dest, size_t number_of_args, ...) {
AWS_PRECONDITION(aws_byte_buf_is_valid(dest));
-
- va_list ap;
- va_start(ap, number_of_args);
-
- for (size_t i = 0; i < number_of_args; ++i) {
- struct aws_byte_buf *buffer = va_arg(ap, struct aws_byte_buf *);
- struct aws_byte_cursor cursor = aws_byte_cursor_from_buf(buffer);
-
- if (aws_byte_buf_append(dest, &cursor)) {
- va_end(ap);
+
+ va_list ap;
+ va_start(ap, number_of_args);
+
+ for (size_t i = 0; i < number_of_args; ++i) {
+ struct aws_byte_buf *buffer = va_arg(ap, struct aws_byte_buf *);
+ struct aws_byte_cursor cursor = aws_byte_cursor_from_buf(buffer);
+
+ if (aws_byte_buf_append(dest, &cursor)) {
+ va_end(ap);
AWS_POSTCONDITION(aws_byte_buf_is_valid(dest));
- return AWS_OP_ERR;
- }
- }
-
- va_end(ap);
+ return AWS_OP_ERR;
+ }
+ }
+
+ va_end(ap);
AWS_POSTCONDITION(aws_byte_buf_is_valid(dest));
- return AWS_OP_SUCCESS;
-}
-
-bool aws_byte_cursor_eq(const struct aws_byte_cursor *a, const struct aws_byte_cursor *b) {
+ return AWS_OP_SUCCESS;
+}
+
+bool aws_byte_cursor_eq(const struct aws_byte_cursor *a, const struct aws_byte_cursor *b) {
AWS_PRECONDITION(aws_byte_cursor_is_valid(a));
AWS_PRECONDITION(aws_byte_cursor_is_valid(b));
bool rv = aws_array_eq(a->ptr, a->len, b->ptr, b->len);
AWS_POSTCONDITION(aws_byte_cursor_is_valid(a));
AWS_POSTCONDITION(aws_byte_cursor_is_valid(b));
return rv;
-}
-
-bool aws_byte_cursor_eq_ignore_case(const struct aws_byte_cursor *a, const struct aws_byte_cursor *b) {
+}
+
+bool aws_byte_cursor_eq_ignore_case(const struct aws_byte_cursor *a, const struct aws_byte_cursor *b) {
AWS_PRECONDITION(aws_byte_cursor_is_valid(a));
AWS_PRECONDITION(aws_byte_cursor_is_valid(b));
bool rv = aws_array_eq_ignore_case(a->ptr, a->len, b->ptr, b->len);
AWS_POSTCONDITION(aws_byte_cursor_is_valid(a));
AWS_POSTCONDITION(aws_byte_cursor_is_valid(b));
return rv;
-}
-
-/* Every possible uint8_t value, lowercased */
+}
+
+/* Every possible uint8_t value, lowercased */
static const uint8_t s_tolower_table[] = {
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 'a',
- 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
- 'x', 'y', 'z', 91, 92, 93, 94, 95, 96, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
- 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 123, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
- 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
- 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
- 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
- 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255};
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 'a',
+ 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
+ 'x', 'y', 'z', 91, 92, 93, 94, 95, 96, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+ 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 123, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
+ 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+ 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
+ 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
+ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
+ 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255};
AWS_STATIC_ASSERT(AWS_ARRAY_SIZE(s_tolower_table) == 256);
-
-const uint8_t *aws_lookup_table_to_lower_get(void) {
- return s_tolower_table;
-}
-
+
+const uint8_t *aws_lookup_table_to_lower_get(void) {
+ return s_tolower_table;
+}
+
bool aws_array_eq_ignore_case(
const void *const array_a,
const size_t len_a,
@@ -400,128 +400,128 @@ bool aws_array_eq_ignore_case(
(len_a == 0) || AWS_MEM_IS_READABLE(array_a, len_a), "Input array [array_a] must be readable up to [len_a].");
AWS_PRECONDITION(
(len_b == 0) || AWS_MEM_IS_READABLE(array_b, len_b), "Input array [array_b] must be readable up to [len_b].");
-
- if (len_a != len_b) {
- return false;
- }
-
- const uint8_t *bytes_a = array_a;
- const uint8_t *bytes_b = array_b;
- for (size_t i = 0; i < len_a; ++i) {
- if (s_tolower_table[bytes_a[i]] != s_tolower_table[bytes_b[i]]) {
- return false;
- }
- }
-
- return true;
-}
-
+
+ if (len_a != len_b) {
+ return false;
+ }
+
+ const uint8_t *bytes_a = array_a;
+ const uint8_t *bytes_b = array_b;
+ for (size_t i = 0; i < len_a; ++i) {
+ if (s_tolower_table[bytes_a[i]] != s_tolower_table[bytes_b[i]]) {
+ return false;
+ }
+ }
+
+ return true;
+}
+
bool aws_array_eq(const void *const array_a, const size_t len_a, const void *const array_b, const size_t len_b) {
AWS_PRECONDITION(
(len_a == 0) || AWS_MEM_IS_READABLE(array_a, len_a), "Input array [array_a] must be readable up to [len_a].");
AWS_PRECONDITION(
(len_b == 0) || AWS_MEM_IS_READABLE(array_b, len_b), "Input array [array_b] must be readable up to [len_b].");
-
- if (len_a != len_b) {
- return false;
- }
-
- if (len_a == 0) {
- return true;
- }
-
- return !memcmp(array_a, array_b, len_a);
-}
-
+
+ if (len_a != len_b) {
+ return false;
+ }
+
+ if (len_a == 0) {
+ return true;
+ }
+
+ return !memcmp(array_a, array_b, len_a);
+}
+
bool aws_array_eq_c_str_ignore_case(const void *const array, const size_t array_len, const char *const c_str) {
AWS_PRECONDITION(
array || (array_len == 0),
"Either input pointer [array_a] mustn't be NULL or input [array_len] mustn't be zero.");
AWS_PRECONDITION(c_str != NULL);
-
- /* Simpler implementation could have been:
- * return aws_array_eq_ignore_case(array, array_len, c_str, strlen(c_str));
- * but that would have traversed c_str twice.
- * This implementation traverses c_str just once. */
-
- const uint8_t *array_bytes = array;
- const uint8_t *str_bytes = (const uint8_t *)c_str;
-
- for (size_t i = 0; i < array_len; ++i) {
- uint8_t s = str_bytes[i];
- if (s == '\0') {
- return false;
- }
-
- if (s_tolower_table[array_bytes[i]] != s_tolower_table[s]) {
- return false;
- }
- }
-
- return str_bytes[array_len] == '\0';
-}
-
+
+ /* Simpler implementation could have been:
+ * return aws_array_eq_ignore_case(array, array_len, c_str, strlen(c_str));
+ * but that would have traversed c_str twice.
+ * This implementation traverses c_str just once. */
+
+ const uint8_t *array_bytes = array;
+ const uint8_t *str_bytes = (const uint8_t *)c_str;
+
+ for (size_t i = 0; i < array_len; ++i) {
+ uint8_t s = str_bytes[i];
+ if (s == '\0') {
+ return false;
+ }
+
+ if (s_tolower_table[array_bytes[i]] != s_tolower_table[s]) {
+ return false;
+ }
+ }
+
+ return str_bytes[array_len] == '\0';
+}
+
bool aws_array_eq_c_str(const void *const array, const size_t array_len, const char *const c_str) {
AWS_PRECONDITION(
array || (array_len == 0),
"Either input pointer [array_a] mustn't be NULL or input [array_len] mustn't be zero.");
AWS_PRECONDITION(c_str != NULL);
-
- /* Simpler implementation could have been:
- * return aws_array_eq(array, array_len, c_str, strlen(c_str));
- * but that would have traversed c_str twice.
- * This implementation traverses c_str just once. */
-
- const uint8_t *array_bytes = array;
- const uint8_t *str_bytes = (const uint8_t *)c_str;
-
- for (size_t i = 0; i < array_len; ++i) {
- uint8_t s = str_bytes[i];
- if (s == '\0') {
- return false;
- }
-
- if (array_bytes[i] != s) {
- return false;
- }
- }
-
- return str_bytes[array_len] == '\0';
-}
-
+
+ /* Simpler implementation could have been:
+ * return aws_array_eq(array, array_len, c_str, strlen(c_str));
+ * but that would have traversed c_str twice.
+ * This implementation traverses c_str just once. */
+
+ const uint8_t *array_bytes = array;
+ const uint8_t *str_bytes = (const uint8_t *)c_str;
+
+ for (size_t i = 0; i < array_len; ++i) {
+ uint8_t s = str_bytes[i];
+ if (s == '\0') {
+ return false;
+ }
+
+ if (array_bytes[i] != s) {
+ return false;
+ }
+ }
+
+ return str_bytes[array_len] == '\0';
+}
+
uint64_t aws_hash_array_ignore_case(const void *array, const size_t len) {
AWS_PRECONDITION(AWS_MEM_IS_READABLE(array, len));
- /* FNV-1a: https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function */
- const uint64_t fnv_offset_basis = 0xcbf29ce484222325ULL;
- const uint64_t fnv_prime = 0x100000001b3ULL;
-
- const uint8_t *i = array;
- const uint8_t *end = i + len;
-
- uint64_t hash = fnv_offset_basis;
- while (i != end) {
- const uint8_t lower = s_tolower_table[*i++];
- hash ^= lower;
+ /* FNV-1a: https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function */
+ const uint64_t fnv_offset_basis = 0xcbf29ce484222325ULL;
+ const uint64_t fnv_prime = 0x100000001b3ULL;
+
+ const uint8_t *i = array;
+ const uint8_t *end = i + len;
+
+ uint64_t hash = fnv_offset_basis;
+ while (i != end) {
+ const uint8_t lower = s_tolower_table[*i++];
+ hash ^= lower;
#ifdef CBMC
# pragma CPROVER check push
# pragma CPROVER check disable "unsigned-overflow"
#endif
- hash *= fnv_prime;
+ hash *= fnv_prime;
#ifdef CBMC
# pragma CPROVER check pop
#endif
- }
- return hash;
-}
-
-uint64_t aws_hash_byte_cursor_ptr_ignore_case(const void *item) {
+ }
+ return hash;
+}
+
+uint64_t aws_hash_byte_cursor_ptr_ignore_case(const void *item) {
AWS_PRECONDITION(aws_byte_cursor_is_valid(item));
const struct aws_byte_cursor *const cursor = item;
uint64_t rval = aws_hash_array_ignore_case(cursor->ptr, cursor->len);
AWS_POSTCONDITION(aws_byte_cursor_is_valid(item));
return rval;
-}
-
+}
+
bool aws_byte_cursor_eq_byte_buf(const struct aws_byte_cursor *const a, const struct aws_byte_buf *const b) {
AWS_PRECONDITION(aws_byte_cursor_is_valid(a));
AWS_PRECONDITION(aws_byte_buf_is_valid(b));
@@ -529,8 +529,8 @@ bool aws_byte_cursor_eq_byte_buf(const struct aws_byte_cursor *const a, const st
AWS_POSTCONDITION(aws_byte_cursor_is_valid(a));
AWS_POSTCONDITION(aws_byte_buf_is_valid(b));
return rv;
-}
-
+}
+
bool aws_byte_cursor_eq_byte_buf_ignore_case(
const struct aws_byte_cursor *const a,
const struct aws_byte_buf *const b) {
@@ -540,176 +540,176 @@ bool aws_byte_cursor_eq_byte_buf_ignore_case(
AWS_POSTCONDITION(aws_byte_cursor_is_valid(a));
AWS_POSTCONDITION(aws_byte_buf_is_valid(b));
return rv;
-}
-
+}
+
bool aws_byte_cursor_eq_c_str(const struct aws_byte_cursor *const cursor, const char *const c_str) {
AWS_PRECONDITION(aws_byte_cursor_is_valid(cursor));
AWS_PRECONDITION(c_str != NULL);
bool rv = aws_array_eq_c_str(cursor->ptr, cursor->len, c_str);
AWS_POSTCONDITION(aws_byte_cursor_is_valid(cursor));
return rv;
-}
-
+}
+
bool aws_byte_cursor_eq_c_str_ignore_case(const struct aws_byte_cursor *const cursor, const char *const c_str) {
AWS_PRECONDITION(aws_byte_cursor_is_valid(cursor));
AWS_PRECONDITION(c_str != NULL);
bool rv = aws_array_eq_c_str_ignore_case(cursor->ptr, cursor->len, c_str);
AWS_POSTCONDITION(aws_byte_cursor_is_valid(cursor));
return rv;
-}
-
-int aws_byte_buf_append(struct aws_byte_buf *to, const struct aws_byte_cursor *from) {
- AWS_PRECONDITION(aws_byte_buf_is_valid(to));
- AWS_PRECONDITION(aws_byte_cursor_is_valid(from));
-
- if (to->capacity - to->len < from->len) {
- AWS_POSTCONDITION(aws_byte_buf_is_valid(to));
- AWS_POSTCONDITION(aws_byte_cursor_is_valid(from));
- return aws_raise_error(AWS_ERROR_DEST_COPY_TOO_SMALL);
- }
-
- if (from->len > 0) {
- /* This assert teaches clang-tidy that from->ptr and to->buffer cannot be null in a non-empty buffers */
- AWS_ASSERT(from->ptr);
- AWS_ASSERT(to->buffer);
- memcpy(to->buffer + to->len, from->ptr, from->len);
- to->len += from->len;
- }
-
- AWS_POSTCONDITION(aws_byte_buf_is_valid(to));
- AWS_POSTCONDITION(aws_byte_cursor_is_valid(from));
- return AWS_OP_SUCCESS;
-}
-
-int aws_byte_buf_append_with_lookup(
- struct aws_byte_buf *AWS_RESTRICT to,
- const struct aws_byte_cursor *AWS_RESTRICT from,
- const uint8_t *lookup_table) {
- AWS_PRECONDITION(aws_byte_buf_is_valid(to));
- AWS_PRECONDITION(aws_byte_cursor_is_valid(from));
+}
+
+int aws_byte_buf_append(struct aws_byte_buf *to, const struct aws_byte_cursor *from) {
+ AWS_PRECONDITION(aws_byte_buf_is_valid(to));
+ AWS_PRECONDITION(aws_byte_cursor_is_valid(from));
+
+ if (to->capacity - to->len < from->len) {
+ AWS_POSTCONDITION(aws_byte_buf_is_valid(to));
+ AWS_POSTCONDITION(aws_byte_cursor_is_valid(from));
+ return aws_raise_error(AWS_ERROR_DEST_COPY_TOO_SMALL);
+ }
+
+ if (from->len > 0) {
+ /* This assert teaches clang-tidy that from->ptr and to->buffer cannot be null in a non-empty buffers */
+ AWS_ASSERT(from->ptr);
+ AWS_ASSERT(to->buffer);
+ memcpy(to->buffer + to->len, from->ptr, from->len);
+ to->len += from->len;
+ }
+
+ AWS_POSTCONDITION(aws_byte_buf_is_valid(to));
+ AWS_POSTCONDITION(aws_byte_cursor_is_valid(from));
+ return AWS_OP_SUCCESS;
+}
+
+int aws_byte_buf_append_with_lookup(
+ struct aws_byte_buf *AWS_RESTRICT to,
+ const struct aws_byte_cursor *AWS_RESTRICT from,
+ const uint8_t *lookup_table) {
+ AWS_PRECONDITION(aws_byte_buf_is_valid(to));
+ AWS_PRECONDITION(aws_byte_cursor_is_valid(from));
AWS_PRECONDITION(
AWS_MEM_IS_READABLE(lookup_table, 256), "Input array [lookup_table] must be at least 256 bytes long.");
-
- if (to->capacity - to->len < from->len) {
- AWS_POSTCONDITION(aws_byte_buf_is_valid(to));
- AWS_POSTCONDITION(aws_byte_cursor_is_valid(from));
- return aws_raise_error(AWS_ERROR_DEST_COPY_TOO_SMALL);
- }
-
- for (size_t i = 0; i < from->len; ++i) {
- to->buffer[to->len + i] = lookup_table[from->ptr[i]];
- }
-
- if (aws_add_size_checked(to->len, from->len, &to->len)) {
- return AWS_OP_ERR;
- }
-
- AWS_POSTCONDITION(aws_byte_buf_is_valid(to));
- AWS_POSTCONDITION(aws_byte_cursor_is_valid(from));
- return AWS_OP_SUCCESS;
-}
-
+
+ if (to->capacity - to->len < from->len) {
+ AWS_POSTCONDITION(aws_byte_buf_is_valid(to));
+ AWS_POSTCONDITION(aws_byte_cursor_is_valid(from));
+ return aws_raise_error(AWS_ERROR_DEST_COPY_TOO_SMALL);
+ }
+
+ for (size_t i = 0; i < from->len; ++i) {
+ to->buffer[to->len + i] = lookup_table[from->ptr[i]];
+ }
+
+ if (aws_add_size_checked(to->len, from->len, &to->len)) {
+ return AWS_OP_ERR;
+ }
+
+ AWS_POSTCONDITION(aws_byte_buf_is_valid(to));
+ AWS_POSTCONDITION(aws_byte_cursor_is_valid(from));
+ return AWS_OP_SUCCESS;
+}
+
static int s_aws_byte_buf_append_dynamic(
struct aws_byte_buf *to,
const struct aws_byte_cursor *from,
bool clear_released_memory) {
- AWS_PRECONDITION(aws_byte_buf_is_valid(to));
- AWS_PRECONDITION(aws_byte_cursor_is_valid(from));
+ AWS_PRECONDITION(aws_byte_buf_is_valid(to));
+ AWS_PRECONDITION(aws_byte_cursor_is_valid(from));
AWS_ERROR_PRECONDITION(to->allocator);
-
- if (to->capacity - to->len < from->len) {
- /*
- * NewCapacity = Max(OldCapacity * 2, OldCapacity + MissingCapacity)
- */
- size_t missing_capacity = from->len - (to->capacity - to->len);
-
- size_t required_capacity = 0;
- if (aws_add_size_checked(to->capacity, missing_capacity, &required_capacity)) {
- AWS_POSTCONDITION(aws_byte_buf_is_valid(to));
- AWS_POSTCONDITION(aws_byte_cursor_is_valid(from));
- return AWS_OP_ERR;
- }
-
- /*
- * It's ok if this overflows, just clamp to max possible.
- * In theory this lets us still grow a buffer that's larger than 1/2 size_t space
- * at least enough to accommodate the append.
- */
- size_t growth_capacity = aws_add_size_saturating(to->capacity, to->capacity);
-
- size_t new_capacity = required_capacity;
- if (new_capacity < growth_capacity) {
- new_capacity = growth_capacity;
- }
-
- /*
- * Attempt to resize - we intentionally do not use reserve() in order to preserve
- * the (unlikely) use case of from and to being the same buffer range.
- */
-
- /*
- * Try the max, but if that fails and the required is smaller, try it in fallback
- */
- uint8_t *new_buffer = aws_mem_acquire(to->allocator, new_capacity);
- if (new_buffer == NULL) {
- if (new_capacity > required_capacity) {
- new_capacity = required_capacity;
- new_buffer = aws_mem_acquire(to->allocator, new_capacity);
- if (new_buffer == NULL) {
- AWS_POSTCONDITION(aws_byte_buf_is_valid(to));
- AWS_POSTCONDITION(aws_byte_cursor_is_valid(from));
- return AWS_OP_ERR;
- }
- } else {
- AWS_POSTCONDITION(aws_byte_buf_is_valid(to));
- AWS_POSTCONDITION(aws_byte_cursor_is_valid(from));
- return AWS_OP_ERR;
- }
- }
-
- /*
- * Copy old buffer -> new buffer
- */
- if (to->len > 0) {
- memcpy(new_buffer, to->buffer, to->len);
- }
- /*
- * Copy what we actually wanted to append in the first place
- */
- if (from->len > 0) {
- memcpy(new_buffer + to->len, from->ptr, from->len);
- }
+
+ if (to->capacity - to->len < from->len) {
+ /*
+ * NewCapacity = Max(OldCapacity * 2, OldCapacity + MissingCapacity)
+ */
+ size_t missing_capacity = from->len - (to->capacity - to->len);
+
+ size_t required_capacity = 0;
+ if (aws_add_size_checked(to->capacity, missing_capacity, &required_capacity)) {
+ AWS_POSTCONDITION(aws_byte_buf_is_valid(to));
+ AWS_POSTCONDITION(aws_byte_cursor_is_valid(from));
+ return AWS_OP_ERR;
+ }
+
+ /*
+ * It's ok if this overflows, just clamp to max possible.
+ * In theory this lets us still grow a buffer that's larger than 1/2 size_t space
+ * at least enough to accommodate the append.
+ */
+ size_t growth_capacity = aws_add_size_saturating(to->capacity, to->capacity);
+
+ size_t new_capacity = required_capacity;
+ if (new_capacity < growth_capacity) {
+ new_capacity = growth_capacity;
+ }
+
+ /*
+ * Attempt to resize - we intentionally do not use reserve() in order to preserve
+ * the (unlikely) use case of from and to being the same buffer range.
+ */
+
+ /*
+ * Try the max, but if that fails and the required is smaller, try it in fallback
+ */
+ uint8_t *new_buffer = aws_mem_acquire(to->allocator, new_capacity);
+ if (new_buffer == NULL) {
+ if (new_capacity > required_capacity) {
+ new_capacity = required_capacity;
+ new_buffer = aws_mem_acquire(to->allocator, new_capacity);
+ if (new_buffer == NULL) {
+ AWS_POSTCONDITION(aws_byte_buf_is_valid(to));
+ AWS_POSTCONDITION(aws_byte_cursor_is_valid(from));
+ return AWS_OP_ERR;
+ }
+ } else {
+ AWS_POSTCONDITION(aws_byte_buf_is_valid(to));
+ AWS_POSTCONDITION(aws_byte_cursor_is_valid(from));
+ return AWS_OP_ERR;
+ }
+ }
+
+ /*
+ * Copy old buffer -> new buffer
+ */
+ if (to->len > 0) {
+ memcpy(new_buffer, to->buffer, to->len);
+ }
+ /*
+ * Copy what we actually wanted to append in the first place
+ */
+ if (from->len > 0) {
+ memcpy(new_buffer + to->len, from->ptr, from->len);
+ }
if (clear_released_memory) {
aws_secure_zero(to->buffer, to->capacity);
}
- /*
- * Get rid of the old buffer
- */
- aws_mem_release(to->allocator, to->buffer);
-
- /*
- * Switch to the new buffer
- */
- to->buffer = new_buffer;
- to->capacity = new_capacity;
- } else {
- if (from->len > 0) {
- /* This assert teaches clang-tidy that from->ptr and to->buffer cannot be null in a non-empty buffers */
- AWS_ASSERT(from->ptr);
- AWS_ASSERT(to->buffer);
- memcpy(to->buffer + to->len, from->ptr, from->len);
- }
- }
-
- to->len += from->len;
-
- AWS_POSTCONDITION(aws_byte_buf_is_valid(to));
- AWS_POSTCONDITION(aws_byte_cursor_is_valid(from));
- return AWS_OP_SUCCESS;
-}
-
+ /*
+ * Get rid of the old buffer
+ */
+ aws_mem_release(to->allocator, to->buffer);
+
+ /*
+ * Switch to the new buffer
+ */
+ to->buffer = new_buffer;
+ to->capacity = new_capacity;
+ } else {
+ if (from->len > 0) {
+ /* This assert teaches clang-tidy that from->ptr and to->buffer cannot be null in a non-empty buffers */
+ AWS_ASSERT(from->ptr);
+ AWS_ASSERT(to->buffer);
+ memcpy(to->buffer + to->len, from->ptr, from->len);
+ }
+ }
+
+ to->len += from->len;
+
+ AWS_POSTCONDITION(aws_byte_buf_is_valid(to));
+ AWS_POSTCONDITION(aws_byte_cursor_is_valid(from));
+ return AWS_OP_SUCCESS;
+}
+
int aws_byte_buf_append_dynamic(struct aws_byte_buf *to, const struct aws_byte_cursor *from) {
return s_aws_byte_buf_append_dynamic(to, from, false);
}
@@ -742,87 +742,87 @@ int aws_byte_buf_append_byte_dynamic_secure(struct aws_byte_buf *buffer, uint8_t
return s_aws_byte_buf_append_byte_dynamic(buffer, value, true);
}
-int aws_byte_buf_reserve(struct aws_byte_buf *buffer, size_t requested_capacity) {
+int aws_byte_buf_reserve(struct aws_byte_buf *buffer, size_t requested_capacity) {
AWS_ERROR_PRECONDITION(buffer->allocator);
AWS_ERROR_PRECONDITION(aws_byte_buf_is_valid(buffer));
-
- if (requested_capacity <= buffer->capacity) {
- AWS_POSTCONDITION(aws_byte_buf_is_valid(buffer));
- return AWS_OP_SUCCESS;
- }
-
- if (aws_mem_realloc(buffer->allocator, (void **)&buffer->buffer, buffer->capacity, requested_capacity)) {
- return AWS_OP_ERR;
- }
-
- buffer->capacity = requested_capacity;
-
- AWS_POSTCONDITION(aws_byte_buf_is_valid(buffer));
- return AWS_OP_SUCCESS;
-}
-
-int aws_byte_buf_reserve_relative(struct aws_byte_buf *buffer, size_t additional_length) {
+
+ if (requested_capacity <= buffer->capacity) {
+ AWS_POSTCONDITION(aws_byte_buf_is_valid(buffer));
+ return AWS_OP_SUCCESS;
+ }
+
+ if (aws_mem_realloc(buffer->allocator, (void **)&buffer->buffer, buffer->capacity, requested_capacity)) {
+ return AWS_OP_ERR;
+ }
+
+ buffer->capacity = requested_capacity;
+
+ AWS_POSTCONDITION(aws_byte_buf_is_valid(buffer));
+ return AWS_OP_SUCCESS;
+}
+
+int aws_byte_buf_reserve_relative(struct aws_byte_buf *buffer, size_t additional_length) {
AWS_ERROR_PRECONDITION(buffer->allocator);
AWS_ERROR_PRECONDITION(aws_byte_buf_is_valid(buffer));
-
- size_t requested_capacity = 0;
- if (AWS_UNLIKELY(aws_add_size_checked(buffer->len, additional_length, &requested_capacity))) {
- AWS_POSTCONDITION(aws_byte_buf_is_valid(buffer));
- return AWS_OP_ERR;
- }
-
- return aws_byte_buf_reserve(buffer, requested_capacity);
-}
-
-struct aws_byte_cursor aws_byte_cursor_right_trim_pred(
- const struct aws_byte_cursor *source,
- aws_byte_predicate_fn *predicate) {
+
+ size_t requested_capacity = 0;
+ if (AWS_UNLIKELY(aws_add_size_checked(buffer->len, additional_length, &requested_capacity))) {
+ AWS_POSTCONDITION(aws_byte_buf_is_valid(buffer));
+ return AWS_OP_ERR;
+ }
+
+ return aws_byte_buf_reserve(buffer, requested_capacity);
+}
+
+struct aws_byte_cursor aws_byte_cursor_right_trim_pred(
+ const struct aws_byte_cursor *source,
+ aws_byte_predicate_fn *predicate) {
AWS_PRECONDITION(aws_byte_cursor_is_valid(source));
AWS_PRECONDITION(predicate != NULL);
- struct aws_byte_cursor trimmed = *source;
-
- while (trimmed.len > 0 && predicate(*(trimmed.ptr + trimmed.len - 1))) {
- --trimmed.len;
- }
+ struct aws_byte_cursor trimmed = *source;
+
+ while (trimmed.len > 0 && predicate(*(trimmed.ptr + trimmed.len - 1))) {
+ --trimmed.len;
+ }
AWS_POSTCONDITION(aws_byte_cursor_is_valid(source));
AWS_POSTCONDITION(aws_byte_cursor_is_valid(&trimmed));
- return trimmed;
-}
-
-struct aws_byte_cursor aws_byte_cursor_left_trim_pred(
- const struct aws_byte_cursor *source,
- aws_byte_predicate_fn *predicate) {
+ return trimmed;
+}
+
+struct aws_byte_cursor aws_byte_cursor_left_trim_pred(
+ const struct aws_byte_cursor *source,
+ aws_byte_predicate_fn *predicate) {
AWS_PRECONDITION(aws_byte_cursor_is_valid(source));
AWS_PRECONDITION(predicate != NULL);
- struct aws_byte_cursor trimmed = *source;
-
- while (trimmed.len > 0 && predicate(*(trimmed.ptr))) {
- --trimmed.len;
- ++trimmed.ptr;
- }
+ struct aws_byte_cursor trimmed = *source;
+
+ while (trimmed.len > 0 && predicate(*(trimmed.ptr))) {
+ --trimmed.len;
+ ++trimmed.ptr;
+ }
AWS_POSTCONDITION(aws_byte_cursor_is_valid(source));
AWS_POSTCONDITION(aws_byte_cursor_is_valid(&trimmed));
- return trimmed;
-}
-
-struct aws_byte_cursor aws_byte_cursor_trim_pred(
- const struct aws_byte_cursor *source,
- aws_byte_predicate_fn *predicate) {
+ return trimmed;
+}
+
+struct aws_byte_cursor aws_byte_cursor_trim_pred(
+ const struct aws_byte_cursor *source,
+ aws_byte_predicate_fn *predicate) {
AWS_PRECONDITION(aws_byte_cursor_is_valid(source));
AWS_PRECONDITION(predicate != NULL);
- struct aws_byte_cursor left_trimmed = aws_byte_cursor_left_trim_pred(source, predicate);
+ struct aws_byte_cursor left_trimmed = aws_byte_cursor_left_trim_pred(source, predicate);
struct aws_byte_cursor dest = aws_byte_cursor_right_trim_pred(&left_trimmed, predicate);
AWS_POSTCONDITION(aws_byte_cursor_is_valid(source));
AWS_POSTCONDITION(aws_byte_cursor_is_valid(&dest));
return dest;
-}
-
-bool aws_byte_cursor_satisfies_pred(const struct aws_byte_cursor *source, aws_byte_predicate_fn *predicate) {
- struct aws_byte_cursor trimmed = aws_byte_cursor_left_trim_pred(source, predicate);
+}
+
+bool aws_byte_cursor_satisfies_pred(const struct aws_byte_cursor *source, aws_byte_predicate_fn *predicate) {
+ struct aws_byte_cursor trimmed = aws_byte_cursor_left_trim_pred(source, predicate);
bool rval = (trimmed.len == 0);
AWS_POSTCONDITION(aws_byte_cursor_is_valid(source));
return rval;
-}
+}
int aws_byte_cursor_compare_lexical(const struct aws_byte_cursor *lhs, const struct aws_byte_cursor *rhs) {
AWS_PRECONDITION(aws_byte_cursor_is_valid(lhs));