Updates for common helper functionality

awslabs · Apr 15, 2024 · cbb958e · cbb958e
1 parent 0053ef1
commit cbb958e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/bin/elastishadow/main.c b/bin/elastishadow/main.c
@@ -1062,8 +1062,8 @@ int main(int argc, char **argv) {
         &app_ctx.streaming_operations,
         allocator,
         10,
-        aws_mqtt_hash_uint64_t,
-        aws_mqtt_compare_uint64_t_eq,
+        aws_hash_uint64_t,
+        aws_hash_compare_uint64_t_eq,
         NULL,
         s_release_streaming_operation);
 

diff --git a/include/aws/mqtt/private/shared.h b/include/aws/mqtt/private/shared.h
@@ -15,9 +15,6 @@ AWS_EXTERN_C_BEGIN
 AWS_MQTT_API extern const struct aws_byte_cursor *g_websocket_handshake_default_path;
 AWS_MQTT_API extern const struct aws_http_header *g_websocket_handshake_default_protocol_header;
 
-AWS_MQTT_API uint64_t aws_mqtt_hash_uint64_t(const void *item);
-AWS_MQTT_API bool aws_mqtt_compare_uint64_t_eq(const void *a, const void *b);
-
 AWS_EXTERN_C_END
 
 #endif /* AWS_MQTT_SHARED_CONSTANTS_H */
diff --git a/source/request-response/request_response_client.c b/source/request-response/request_response_client.c
@@ -1108,14 +1108,6 @@ static void s_aws_rr_client_protocol_adapter_connection_event_callback(
     aws_rr_subscription_manager_on_protocol_adapter_connection_event(&rr_client->subscription_manager, event);
 }
 
-uint64_t aws_mqtt_hash_uint64_t(const void *item) {
-    return *(uint64_t *)item;
-}
-
-bool aws_mqtt_compare_uint64_t_eq(const void *a, const void *b) {
-    return *(uint64_t *)a == *(uint64_t *)b;
-}
-
 static int s_compare_rr_operation_timeouts(const void *a, const void *b) {
     const struct aws_mqtt_rr_client_operation **operation_a_ptr = (void *)a;
     const struct aws_mqtt_rr_client_operation *operation_a = *operation_a_ptr;
@@ -1165,8 +1157,8 @@ static struct aws_mqtt_request_response_client *s_aws_mqtt_request_response_clie
         &rr_client->operations,
         allocator,
         MQTT_RR_CLIENT_OPERATION_TABLE_DEFAULT_SIZE,
-        aws_mqtt_hash_uint64_t,
-        aws_mqtt_compare_uint64_t_eq,
+        aws_hash_uint64_t,
+        aws_hash_compare_uint64_t_eq,
         NULL,
         NULL);