Skip to content

Rhel5 build fixes #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 3, 2020
Merged

Rhel5 build fixes #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2a8c7a
Misc fixes
bretambrose May 1, 2020
5a4b18c
Sigh
bretambrose May 1, 2020
c136aee
Format weirdness
bretambrose May 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions source/http.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@

#include <ctype.h>

#ifdef _MSC_VER
# pragma warning(disable : 4311) /* 'type cast': pointer truncation from 'void *' to 'int' */
#else
# pragma GCC diagnostic ignored "-Wpointer-to-int-cast"
#endif

#define AWS_DEFINE_ERROR_INFO_HTTP(CODE, STR) [(CODE)-0x0800] = AWS_DEFINE_ERROR_INFO(CODE, STR, "aws-c-http")

/* clang-format off */
Expand Down Expand Up @@ -147,6 +141,16 @@ static struct aws_log_subject_info_list s_log_subject_list = {
.count = AWS_ARRAY_SIZE(s_log_subject_infos),
};

struct aws_enum_value {
struct aws_allocator *allocator;
int value;
};

static void s_destroy_enum_value(void *value) {
struct aws_enum_value *enum_value = value;
aws_mem_release(enum_value->allocator, enum_value);
}

/**
* Given array of aws_byte_cursors, init hashtable where...
* Key is aws_byte_cursor* (pointing into cursor from array) and comparisons are case-insensitive.
Expand All @@ -167,13 +171,18 @@ static void s_init_str_to_enum_hash_table(
ignore_case ? aws_hash_byte_cursor_ptr_ignore_case : aws_hash_byte_cursor_ptr,
(aws_hash_callback_eq_fn *)(ignore_case ? aws_byte_cursor_eq_ignore_case : aws_byte_cursor_eq),
NULL,
NULL);
s_destroy_enum_value);
AWS_FATAL_ASSERT(!err);

for (size_t i = start_index; i < (size_t)end_index; ++i) {
int was_created;
for (int i = start_index; i < end_index; ++i) {
int was_created = 0;
struct aws_enum_value *enum_value = aws_mem_calloc(alloc, 1, sizeof(struct aws_enum_value));
AWS_FATAL_ASSERT(enum_value);
enum_value->allocator = alloc;
enum_value->value = i;

AWS_FATAL_ASSERT(str_array[i].ptr && "Missing enum string");
err = aws_hash_table_put(table, &str_array[i], (void *)i, &was_created);
err = aws_hash_table_put(table, &str_array[i], (void *)enum_value, &was_created);
AWS_FATAL_ASSERT(!err && was_created);
}
}
Expand All @@ -186,7 +195,8 @@ static int s_find_in_str_to_enum_hash_table(const struct aws_hash_table *table,
struct aws_hash_element *elem;
aws_hash_table_find(table, key, &elem);
if (elem) {
return (int)elem->value;
struct aws_enum_value *enum_value = elem->value;
return enum_value->value;
}
return -1;
}
Expand Down Expand Up @@ -235,7 +245,7 @@ static void s_versions_init(struct aws_allocator *alloc) {
static void s_versions_clean_up(void) {}

struct aws_byte_cursor aws_http_version_to_str(enum aws_http_version version) {
if (version < AWS_HTTP_VERSION_UNKNOWN || version >= AWS_HTTP_VERSION_COUNT) {
if ((int)version < AWS_HTTP_VERSION_UNKNOWN || (int)version >= AWS_HTTP_VERSION_COUNT) {
version = AWS_HTTP_VERSION_UNKNOWN;
}

Expand Down
2 changes: 1 addition & 1 deletion tests/proxy_test_helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,4 +340,4 @@ int proxy_tester_verify_connection_attempt_was_to_proxy(
ASSERT_TRUE(tester->connection_port == expected_port);

return AWS_OP_SUCCESS;
}
}