From 5001b9fd083aed76e1966abdaa27ae7ec4fcd98f Mon Sep 17 00:00:00 2001 From: Anay Wadhera Date: Thu, 13 Feb 2025 19:28:21 -0800 Subject: [PATCH] Make NC_DATA's length field an unsigned int PiperOrigin-RevId: 726729432 --- connections/c/nc.cc | 4 ++-- connections/c/nc_types.h | 2 +- connections/dart/nc_adapter_dart.cc | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/connections/c/nc.cc b/connections/c/nc.cc index f3247218..c5f513ee 100644 --- a/connections/c/nc.cc +++ b/connections/c/nc.cc @@ -333,9 +333,9 @@ void NcStartDiscovery(NC_INSTANCE instance, const NC_DATA* service_id, const nearby::ByteArray& endpoint_info, const std::string& service_id) { NC_DATA endpoint_info_data = { - .size = static_cast(endpoint_info.size()), + .size = static_cast(endpoint_info.size()), .data = (char*)endpoint_info.data()}; - NC_DATA service_id_data = {.size = static_cast(service_id.size()), + NC_DATA service_id_data = {.size = static_cast(service_id.size()), .data = (char*)service_id.data()}; discovery_listener_copy.endpoint_found_callback( instance, convertStringToInt(endpoint_id), &endpoint_info_data, diff --git a/connections/c/nc_types.h b/connections/c/nc_types.h index e6b615f0..8043dc28 100644 --- a/connections/c/nc_types.h +++ b/connections/c/nc_types.h @@ -30,7 +30,7 @@ typedef void* CALLER_CONTEXT; // NC_DATA is used to define a byte array. Its last byte is not zero. typedef struct NC_DATA { - int64_t size; + uint64_t size; char* data; } NC_DATA, *PNC_DATA; diff --git a/connections/dart/nc_adapter_dart.cc b/connections/dart/nc_adapter_dart.cc index 72f09b58..3aeade4f 100644 --- a/connections/dart/nc_adapter_dart.cc +++ b/connections/dart/nc_adapter_dart.cc @@ -502,8 +502,8 @@ void StartAdvertisingDart(NC_INSTANCE instance, DataDart service_id, request_info.disconnected_callback = ListenerDisconnectedCB; request_info.bandwidth_changed_callback = ListenerBandwidthChangedCB; - NC_DATA service_id_data = - NC_DATA{.size = service_id.size, .data = service_id.data}; + NC_DATA service_id_data = NC_DATA{ + .size = static_cast(service_id.size), .data = service_id.data}; NcStartAdvertising( instance, &service_id_data, &advertising_options, &request_info, [](NC_STATUS status, void *context) { @@ -579,8 +579,8 @@ void StartDiscoveryDart(NC_INSTANCE instance, DataDart service_id, listener.endpoint_found_callback = &ListenerEndpointFoundCB; listener.endpoint_lost_callback = &ListenerEndpointLostCB; - NC_DATA service_id_data = - NC_DATA{.size = service_id.size, .data = service_id.data}; + NC_DATA service_id_data = NC_DATA{ + .size = static_cast(service_id.size), .data = service_id.data}; NcStartDiscovery( instance, &service_id_data, &discovery_options, &listener, [](NC_STATUS status, void *context) {