CXX_BUILD fixes for net_natt.c

This commit is contained in:
twinaphex 2022-03-30 15:32:23 +02:00
parent c8d57fe667
commit 26fec17593
1 changed files with 27 additions and 27 deletions

View File

@ -352,10 +352,10 @@ static bool parse_desc_node(rxml_node_t *node,
static void natt_query_device_cb(retro_task_t *task, void *task_data,
void *user_data, const char *error)
{
char *xml;
rxml_document_t *document;
http_transfer_data_t *data = task_data;
struct natt_device *device = user_data;
char *xml = NULL;
rxml_document_t *document = NULL;
http_transfer_data_t *data = (http_transfer_data_t*)task_data;
struct natt_device *device = (struct natt_device*)user_data;
*device->control = '\0';
*device->service_type = '\0';
@ -367,7 +367,7 @@ static void natt_query_device_cb(retro_task_t *task, void *task_data,
if (data->status != 200)
goto done;
xml = malloc(data->len + 1);
xml = (char*)malloc(data->len + 1);
if (!xml)
goto done;
memcpy(xml, data->data, data->len);
@ -458,10 +458,10 @@ static bool parse_external_address_node(rxml_node_t *node,
static void natt_external_address_cb(retro_task_t *task, void *task_data,
void *user_data, const char *error)
{
char *xml;
rxml_document_t *document;
http_transfer_data_t *data = task_data;
struct natt_device *device = user_data;
char *xml = NULL;
rxml_document_t *document = NULL;
http_transfer_data_t *data = (http_transfer_data_t*)task_data;
struct natt_device *device = (struct natt_device*)user_data;
memset(&device->ext_addr, 0, sizeof(device->ext_addr));
@ -472,7 +472,7 @@ static void natt_external_address_cb(retro_task_t *task, void *task_data,
if (data->status != 200)
goto done;
xml = malloc(data->len + 1);
xml = (char*)malloc(data->len + 1);
if (!xml)
goto done;
memcpy(xml, data->data, data->len);
@ -541,11 +541,11 @@ static bool parse_open_port_node(rxml_node_t *node,
static void natt_open_port_cb(retro_task_t *task, void *task_data,
void *user_data, const char *error)
{
char *xml;
rxml_document_t *document;
http_transfer_data_t *data = task_data;
struct natt_request *request = user_data;
struct natt_device *device = request->device;
char *xml = NULL;
rxml_document_t *document = NULL;
http_transfer_data_t *data = (http_transfer_data_t*)task_data;
struct natt_request *request = (struct natt_request*)user_data;
struct natt_device *device = (struct natt_device*)request->device;
request->success = false;
@ -556,7 +556,7 @@ static void natt_open_port_cb(retro_task_t *task, void *task_data,
if (data->status != 200)
goto done;
xml = malloc(data->len + 1);
xml = (char*)malloc(data->len + 1);
if (!xml)
goto done;
memcpy(xml, data->data, data->len);
@ -582,9 +582,9 @@ done:
static void natt_close_port_cb(retro_task_t *task, void *task_data,
void *user_data, const char *error)
{
http_transfer_data_t *data = task_data;
struct natt_request *request = user_data;
struct natt_device *device = request->device;
http_transfer_data_t *data = (http_transfer_data_t*)task_data;
struct natt_request *request = (struct natt_request*)user_data;
struct natt_device *device = (struct natt_device*)request->device;
request->success = false;