diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c index cc219742f8..e5fb15aafb 100644 --- a/gfx/drivers/vulkan.c +++ b/gfx/drivers/vulkan.c @@ -896,8 +896,8 @@ static bool vulkan_init_default_filter_chain(vk_t *vk) #ifdef VULKAN_HDR_SWAPCHAIN if (vk->context->hdr_enable) { - struct video_shader* shader_preset = vulkan_filter_chain_get_preset(vk->filter_chain); - VkFormat rt_format = vulkan_filter_chain_get_pass_rt_format(vk->filter_chain, shader_preset->passes - 1); + struct video_shader* shader_preset = vulkan_filter_chain_get_preset((vulkan_filter_chain_t*)vk->filter_chain); + VkFormat rt_format = vulkan_filter_chain_get_pass_rt_format((vulkan_filter_chain_t*)vk->filter_chain, shader_preset->passes - 1); if(shader_preset && shader_preset->passes && (rt_format == VK_FORMAT_A2B10G10R10_UNORM_PACK32)) { @@ -958,8 +958,8 @@ static bool vulkan_init_filter_chain_preset(vk_t *vk, const char *shader_path) #ifdef VULKAN_HDR_SWAPCHAIN if (vk->context->hdr_enable) { - struct video_shader* shader_preset = vulkan_filter_chain_get_preset(vk->filter_chain); - VkFormat rt_format = vulkan_filter_chain_get_pass_rt_format(vk->filter_chain, shader_preset->passes - 1); + struct video_shader* shader_preset = vulkan_filter_chain_get_preset((vulkan_filter_chain_t*)vk->filter_chain); + VkFormat rt_format = vulkan_filter_chain_get_pass_rt_format((vulkan_filter_chain_t*)vk->filter_chain, shader_preset->passes - 1); if(shader_preset && shader_preset->passes && (rt_format == VK_FORMAT_A2B10G10R10_UNORM_PACK32)) { @@ -1938,8 +1938,8 @@ static bool vulkan_frame(void *data, const void *frame, bool overlay_behind_menu = video_info->overlay_behind_menu; #ifdef VULKAN_HDR_SWAPCHAIN - struct video_shader* shader_preset = vulkan_filter_chain_get_preset(vk->filter_chain); - VkFormat main_buffer_format = shader_preset && shader_preset->passes ? vulkan_filter_chain_get_pass_rt_format(vk->filter_chain, shader_preset->passes - 1) : VK_FORMAT_R8G8B8A8_UNORM; + struct video_shader* shader_preset = vulkan_filter_chain_get_preset((vulkan_filter_chain_t*)vk->filter_chain); + VkFormat main_buffer_format = shader_preset && shader_preset->passes ? vulkan_filter_chain_get_pass_rt_format((vulkan_filter_chain_t*)vk->filter_chain, shader_preset->passes - 1) : VK_FORMAT_R8G8B8A8_UNORM; bool use_main_buffer = main_buffer_format != vk->context->swapchain_format; #endif /* VULKAN_HDR_SWAPCHAIN */ diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c index 97fd75c55a..9a9d35dc76 100644 --- a/network/netplay/netplay_frontend.c +++ b/network/netplay/netplay_frontend.c @@ -6350,7 +6350,7 @@ static int init_tcp_connection(netplay_t *netplay, const struct addrinfo *res, sizeof(netplay->mitm_session_id.unique))) { /* Initialize data for handling tunneled client connections. */ - netplay->mitm_pending = calloc(1, sizeof(*netplay->mitm_pending)); + netplay->mitm_pending = (struct netplay_mitm_pending*)calloc(1, sizeof(*netplay->mitm_pending)); if (netplay->mitm_pending) { memset(netplay->mitm_pending->fds, -1, @@ -6743,8 +6743,8 @@ netplay_t *netplay_new(const char *server, const char *mitm, uint16_t port, const struct retro_callbacks *cb, bool nat_traversal, const char *nick, uint64_t quirks) { - settings_t *settings = config_get_ptr(); - netplay_t *netplay = calloc(1, sizeof(*netplay)); + settings_t *settings = config_get_ptr(); + netplay_t *netplay = (netplay_t*)calloc(1, sizeof(*netplay)); if (!netplay) return NULL; @@ -7781,13 +7781,13 @@ static void netplay_announce_cb(retro_task_t *task, if (data->status != 200) return; - buf_start = malloc(data->len); + buf_start = (char*)malloc(data->len); if (!buf_start) return; memcpy(buf_start, data->data, data->len); - buf = buf_start; - remaining = data->len; + buf = buf_start; + remaining = data->len; do { char *lnbreak, *delim; @@ -8015,9 +8015,9 @@ static void netplay_mitm_query_cb(retro_task_t *task, void *task_data, { char *buf_start, *buf; size_t remaining; - net_driver_state_t *net_st = &networking_driver_st; - struct netplay_room *host_room = &net_st->host_room; - http_transfer_data_t *data = task_data; + net_driver_state_t *net_st = (net_driver_state_t*)&networking_driver_st; + struct netplay_room *host_room = (struct netplay_room*)&net_st->host_room; + http_transfer_data_t *data = (http_transfer_data_t*)task_data; if (error) return; @@ -8026,30 +8026,30 @@ static void netplay_mitm_query_cb(retro_task_t *task, void *task_data, if (data->status != 200) return; - buf_start = malloc(data->len); + buf_start = (char*)malloc(data->len); if (!buf_start) return; memcpy(buf_start, data->data, data->len); - buf = buf_start; - remaining = data->len; + buf = buf_start; + remaining = data->len; do { - char *lnbreak, *delim; - char *key, *value; - - lnbreak = (char*) memchr(buf, '\n', remaining); + char *delim = NULL; + char *key = NULL; + char *value = NULL; + char *lnbreak = (char*) memchr(buf, '\n', remaining); if (!lnbreak) break; *lnbreak++ = '\0'; - delim = (char*) strchr(buf, '='); + delim = (char*)strchr(buf, '='); if (delim) { - *delim++ = '\0'; + *delim++ = '\0'; - key = buf; - value = delim; + key = buf; + value = delim; if (!string_is_empty(key) && !string_is_empty(value)) { @@ -8062,7 +8062,7 @@ static void netplay_mitm_query_cb(retro_task_t *task, void *task_data, } remaining -= (size_t)lnbreak - (size_t)buf; - buf = lnbreak; + buf = lnbreak; } while (remaining); free(buf_start); @@ -8082,20 +8082,19 @@ static bool netplay_mitm_query(const char *mitm_name) { char addr[256]; char sess[sizeof(addr)]; - unsigned port; + unsigned port = 0; settings_t *settings = config_get_ptr(); const char *custom_server = settings->paths.netplay_custom_mitm_server; - addr[0] = '\0'; - sess[0] = '\0'; - port = 0; + addr[0] = '\0'; + sess[0] = '\0'; netplay_decode_hostname(custom_server, addr, &port, sess, sizeof(addr)); if (!port) - port = RARCH_DEFAULT_PORT; + port = RARCH_DEFAULT_PORT; strlcpy(host_room->mitm_address, addr, sizeof(host_room->mitm_address)); @@ -8700,8 +8699,8 @@ static void gfx_widget_netplay_chat_iterate(void *user_data, static void gfx_widget_netplay_chat_frame(void *data, void *userdata) { size_t i; - video_frame_info_t *video_info = data; - dispgfx_widget_t *p_dispwidget = userdata; + video_frame_info_t *video_info = (video_frame_info_t*)data; + dispgfx_widget_t *p_dispwidget = (dispgfx_widget_t*)userdata; net_driver_state_t *net_st = &networking_driver_st; struct netplay_chat_buffer *chat_buffer = &net_st->chat_buffer; int line_height = @@ -8798,9 +8797,9 @@ static void gfx_widget_netplay_ping_iterate(void *user_data, static void gfx_widget_netplay_ping_frame(void *data, void *userdata) { - video_frame_info_t *video_info = data; - dispgfx_widget_t *p_dispwidget = userdata; - net_driver_state_t *net_st = &networking_driver_st; + video_frame_info_t *video_info = (video_frame_info_t*)data; + dispgfx_widget_t *p_dispwidget = (dispgfx_widget_t*)userdata; + net_driver_state_t *net_st = (net_driver_state_t*)&networking_driver_st; int ping = net_st->latest_ping; if (ping >= 0) @@ -8808,13 +8807,13 @@ static void gfx_widget_netplay_ping_frame(void *data, void *userdata) char ping_str[16]; int ping_len; int ping_width, total_width; - gfx_display_t *p_disp = video_info->disp_userdata; + gfx_display_t *p_disp = (gfx_display_t*)video_info->disp_userdata; /* Limit ping counter to 999. */ if (ping > 999) ping = 999; - ping_len = snprintf(ping_str, sizeof(ping_str), + ping_len = snprintf(ping_str, sizeof(ping_str), "PING: %d", ping); ping_width = font_driver_get_message_width( diff --git a/tasks/task_netplay_nat_traversal.c b/tasks/task_netplay_nat_traversal.c index 2ee3ab8614..3e35f81d21 100644 --- a/tasks/task_netplay_nat_traversal.c +++ b/tasks/task_netplay_nat_traversal.c @@ -50,16 +50,16 @@ static bool find_local_address(struct natt_device *device, size_t i, j, k; uint32_t highest_score = 0; struct addrinfo hints = {0}; - uint8_t *dev_addr8 = (uint8_t *) &device->addr.sin_addr; + uint8_t *dev_addr8 = (uint8_t *)&device->addr.sin_addr; - addrs = calloc(interfaces.size, sizeof(*addrs)); + addrs = (struct addrinfo*)calloc(interfaces.size, sizeof(*addrs)); if (!addrs) goto done; - scores = calloc(interfaces.size, sizeof(*scores)); + scores = (uint32_t*)calloc(interfaces.size, sizeof(*scores)); if (!scores) goto done; - hints.ai_family = AF_INET; + hints.ai_family = AF_INET; /* Score interfaces based on how "close" their address is from the device's address. */ @@ -142,7 +142,7 @@ static void task_netplay_nat_traversal_handler(retro_task_t *task) { static struct natt_discovery discovery = {-1}; static struct natt_device device = {0}; - struct nat_traversal_data *data = task->task_data; + struct nat_traversal_data *data = (struct nat_traversal_data*)task->task_data; /* Try again on the next call. */ if (device.busy) @@ -296,25 +296,25 @@ static bool nat_task_queued(void *data) bool task_push_netplay_nat_traversal(void *data, uint16_t port) { - retro_task_t *task; - struct nat_traversal_data *natt_data = data; + retro_task_t *task = NULL; + struct nat_traversal_data *natt_data = (struct nat_traversal_data*)data; /* Do not run more than one NAT task at a time. */ task_queue_wait(nat_task_queued, NULL); - task = task_init(); + task = task_init(); if (!task) return false; - natt_data->request.addr.sin_family = AF_INET; - natt_data->request.addr.sin_port = htons(port); - natt_data->request.proto = SOCKET_PROTOCOL_TCP; - natt_data->request.device = NULL; - natt_data->status = NAT_TRAVERSAL_STATUS_DISCOVERY; + natt_data->request.addr.sin_family = AF_INET; + natt_data->request.addr.sin_port = htons(port); + natt_data->request.proto = SOCKET_PROTOCOL_TCP; + natt_data->request.device = NULL; + natt_data->status = NAT_TRAVERSAL_STATUS_DISCOVERY; - task->handler = task_netplay_nat_traversal_handler; - task->callback = netplay_nat_traversal_callback; - task->task_data = data; + task->handler = task_netplay_nat_traversal_handler; + task->callback = netplay_nat_traversal_callback; + task->task_data = data; task_queue_push(task); @@ -323,8 +323,8 @@ bool task_push_netplay_nat_traversal(void *data, uint16_t port) bool task_push_netplay_nat_close(void *data) { - retro_task_t *task; - struct nat_traversal_data *natt_data = data; + retro_task_t *task = NULL; + struct nat_traversal_data *natt_data = (struct nat_traversal_data*)data; /* Do not run more than one NAT task at a time. */ task_queue_wait(nat_task_queued, NULL); @@ -346,8 +346,8 @@ bool task_push_netplay_nat_close(void *data) natt_data->status = NAT_TRAVERSAL_STATUS_CLOSE; - task->handler = task_netplay_nat_traversal_handler; - task->task_data = data; + task->handler = task_netplay_nat_traversal_handler; + task->task_data = data; task_queue_push(task);