diff --git a/audio/audio_driver.c b/audio/audio_driver.c index 8ac632196b78..a93ac56f7b2a 100644 --- a/audio/audio_driver.c +++ b/audio/audio_driver.c @@ -166,7 +166,7 @@ static void compute_audio_buffer_statistics(void) unsigned low_water_count = 0; unsigned high_water_count = 0; unsigned samples = MIN( - audio_driver_free_samples_count, + (unsigned)audio_driver_free_samples_count, AUDIO_BUFFER_FREE_SAMPLES_COUNT); if (samples < 3) @@ -175,7 +175,7 @@ static void compute_audio_buffer_statistics(void) for (i = 1; i < samples; i++) accum += audio_driver_free_samples_buf[i]; - avg = accum / (samples - 1); + avg = (unsigned)accum / (samples - 1); for (i = 1; i < samples; i++) { @@ -576,9 +576,9 @@ static bool audio_driver_flush(const int16_t *data, size_t samples) /* Readjust the audio input rate. */ unsigned write_idx = audio_driver_free_samples_count++ & (AUDIO_BUFFER_FREE_SAMPLES_COUNT - 1); - int half_size = audio_driver_buffer_size / 2; + int half_size = (int)(audio_driver_buffer_size / 2); int avail = - current_audio->write_avail(audio_driver_context_audio_data); + (int)current_audio->write_avail(audio_driver_context_audio_data); int delta_mid = avail - half_size; double direction = (double)delta_mid / half_size; double adjust = 1.0 + settings->audio.rate_control_delta * direction; @@ -611,7 +611,7 @@ static bool audio_driver_flush(const int16_t *data, size_t samples) performance_counter_stop_plus(is_perfcnt_enable, resampler_proc); output_data = audio_driver_output_samples_buf; - output_frames = src_data.output_frames; + output_frames = (unsigned)src_data.output_frames; if (!audio_driver_use_float) { @@ -817,7 +817,7 @@ bool audio_driver_find_driver(void) driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv); - i = drv.len; + i = (int)drv.len; if (i >= 0) current_audio = (const audio_driver_t*)audio_driver_find_handle(i); diff --git a/audio/audio_mixer.c b/audio/audio_mixer.c index e63e70edd415..053cfe4324b8 100644 --- a/audio/audio_mixer.c +++ b/audio/audio_mixer.c @@ -278,7 +278,7 @@ audio_mixer_sound_t* audio_mixer_load_wav(const char* path) } sound->type = AUDIO_MIXER_TYPE_WAV; - sound->types.wav.frames = samples / 2; + sound->types.wav.frames = (unsigned)(samples / 2); sound->types.wav.pcm = pcm; rwav_free(&wav); @@ -447,7 +447,7 @@ void audio_mixer_stop(audio_mixer_voice_t* voice) static void mix_wav(float* buffer, size_t num_frames, audio_mixer_voice_t* voice) { int i; - unsigned buf_free = num_frames * 2; + unsigned buf_free = (unsigned)(num_frames * 2); const audio_mixer_sound_t* sound = voice->sound; unsigned pcm_available = sound->types.wav.frames * 2 - voice->types.wav.position; diff --git a/camera/camera_driver.c b/camera/camera_driver.c index 4ce2ef7ca56e..4c3f54974d8a 100644 --- a/camera/camera_driver.c +++ b/camera/camera_driver.c @@ -140,7 +140,7 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data) driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv); - i = drv.len; + i = (int)drv.len; if (i >= 0) camera_driver = (const camera_driver_t*)camera_driver_find_handle(i); diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c index 6ada9611b831..0c74d674904d 100644 --- a/cheevos/cheevos.c +++ b/cheevos/cheevos.c @@ -979,8 +979,8 @@ static unsigned cheevos_read_hits(const char **memaddr) if (*str == '(' || *str == '.') { - num_hits = strtol(str + 1, &end, 10); - str = end + 1; + num_hits = (unsigned)strtol(str + 1, &end, 10); + str = end + 1; } *memaddr = str; @@ -1109,8 +1109,8 @@ void cheevos_parse_guest_addr(cheevos_var_t *var, unsigned value) { if (((desc->core.start ^ var->value) & desc->core.select) == 0) { - var->bank_id = desc - system->mmaps.descriptors; - var->value = cheevos_reduce( + var->bank_id = (int)(desc - system->mmaps.descriptors); + var->value = (unsigned)cheevos_reduce( (var->value - desc->core.start) & desc->disconnect_mask, desc->core.disconnect); @@ -1505,12 +1505,12 @@ static int cheevos_new_cheevo(cheevos_readud_t *ud) else cheevo = cheevos_locals.unofficial.cheevos + ud->unofficial_count++; - cheevo->id = strtol(ud->id.string, NULL, 10); + cheevo->id = (unsigned)strtol(ud->id.string, NULL, 10); cheevo->title = cheevos_dupstr(&ud->title); cheevo->description = cheevos_dupstr(&ud->desc); cheevo->author = cheevos_dupstr(&ud->author); cheevo->badge = cheevos_dupstr(&ud->badge); - cheevo->points = strtol(ud->points.string, NULL, 10); + cheevo->points = (unsigned)strtol(ud->points.string, NULL, 10); cheevo->dirty = 0; cheevo->active = CHEEVOS_ACTIVE_SOFTCORE | CHEEVOS_ACTIVE_HARDCORE; cheevo->last = 1; @@ -1669,7 +1669,7 @@ static int cheevos_read__json_number(void *userdata, } else if (ud->is_console_id) { - cheevos_locals.console_id = strtol(number, NULL, 10); + cheevos_locals.console_id = (int)strtol(number, NULL, 10); ud->is_console_id = 0; } @@ -2498,7 +2498,7 @@ static unsigned cheevos_get_game_id(unsigned char *hash, retro_time_t *timeout) if (!res) { RARCH_LOG("CHEEVOS got game id %s.\n", game_id); - return strtoul(game_id, NULL, 10); + return (unsigned)strtoul(game_id, NULL, 10); } } diff --git a/command.c b/command.c index ea6719d5fc44..af6eb8065bce 100644 --- a/command.c +++ b/command.c @@ -1315,7 +1315,7 @@ static void command_event_set_savestate_auto_index(void) while ((end > dir_elem) && isdigit((int)end[-1])) end--; - idx = strtoul(end, NULL, 0); + idx = (unsigned)strtoul(end, NULL, 0); if (idx > max_idx) max_idx = idx; } @@ -2046,7 +2046,7 @@ bool command_event(enum event_command cmd, void *data) #endif { if (settings->rewind_enable) - state_manager_event_init(settings->rewind_buffer_size); + state_manager_event_init((unsigned)settings->rewind_buffer_size); } } break; diff --git a/configuration.c b/configuration.c index 6e9e8faae135..f501ff7325e1 100644 --- a/configuration.c +++ b/configuration.c @@ -2668,7 +2668,7 @@ static void save_keybind_hat(config_file_t *conf, const char *key, const struct retro_keybind *bind) { char config[16]; - unsigned hat = GET_HAT(bind->joykey); + unsigned hat = (unsigned)GET_HAT(bind->joykey); const char *dir = NULL; config[0] = '\0'; diff --git a/cores/libretro-imageviewer/image_core.c b/cores/libretro-imageviewer/image_core.c index caa0ac2e2cad..fdc28b908866 100644 --- a/cores/libretro-imageviewer/image_core.c +++ b/cores/libretro-imageviewer/image_core.c @@ -410,8 +410,8 @@ void IMAGE_CORE_PREFIX(retro_run)(void) } else if (last_image) { - image_index = file_list->size - 1; - load_image = true; + image_index = (int)(file_list->size - 1); + load_image = true; } if (load_image) diff --git a/database_info.c b/database_info.c index 28120c528f3f..07ec9a628c44 100644 --- a/database_info.c +++ b/database_info.c @@ -293,52 +293,52 @@ static int database_cursor_iterate(libretrodb_cursor_t *cur, break; case DB_CURSOR_CERO_RATING: if (!string_is_empty(val_string)) - db_info->cero_rating = strdup(val_string); + db_info->cero_rating = strdup(val_string); break; case DB_CURSOR_PEGI_RATING: if (!string_is_empty(val_string)) - db_info->pegi_rating = strdup(val_string); + db_info->pegi_rating = strdup(val_string); break; case DB_CURSOR_ENHANCEMENT_HW: if (!string_is_empty(val_string)) - db_info->enhancement_hw = strdup(val_string); + db_info->enhancement_hw = strdup(val_string); break; case DB_CURSOR_EDGE_MAGAZINE_REVIEW: if (!string_is_empty(val_string)) db_info->edge_magazine_review = strdup(val_string); break; case DB_CURSOR_EDGE_MAGAZINE_RATING: - db_info->edge_magazine_rating = val->val.uint_; + db_info->edge_magazine_rating = (unsigned)val->val.uint_; break; case DB_CURSOR_EDGE_MAGAZINE_ISSUE: - db_info->edge_magazine_issue = val->val.uint_; + db_info->edge_magazine_issue = (unsigned)val->val.uint_; break; case DB_CURSOR_FAMITSU_MAGAZINE_RATING: - db_info->famitsu_magazine_rating = val->val.uint_; + db_info->famitsu_magazine_rating = (unsigned)val->val.uint_; break; case DB_CURSOR_TGDB_RATING: - db_info->tgdb_rating = val->val.uint_; + db_info->tgdb_rating = (unsigned)val->val.uint_; break; case DB_CURSOR_MAX_USERS: - db_info->max_users = val->val.uint_; + db_info->max_users = (unsigned)val->val.uint_; break; case DB_CURSOR_RELEASEDATE_MONTH: - db_info->releasemonth = val->val.uint_; + db_info->releasemonth = val->val.uint_; break; case DB_CURSOR_RELEASEDATE_YEAR: - db_info->releaseyear = val->val.uint_; + db_info->releaseyear = (unsigned)val->val.uint_; break; case DB_CURSOR_RUMBLE_SUPPORTED: - db_info->rumble_supported = val->val.uint_; + db_info->rumble_supported = (int)val->val.uint_; break; case DB_CURSOR_COOP_SUPPORTED: - db_info->coop_supported = val->val.uint_; + db_info->coop_supported = (int)val->val.uint_; break; case DB_CURSOR_ANALOG_SUPPORTED: - db_info->analog_supported = val->val.uint_; + db_info->analog_supported = (int)val->val.uint_; break; case DB_CURSOR_SIZE: - db_info->size = val->val.uint_; + db_info->size = (unsigned)val->val.uint_; break; case DB_CURSOR_CHECKSUM_CRC32: db_info->crc32 = swap_if_little32(*(uint32_t*)val->val.binary.buff); diff --git a/deps/miniupnpc/minissdpc.c b/deps/miniupnpc/minissdpc.c index 59016c8549bb..5b1de09634f9 100644 --- a/deps/miniupnpc/minissdpc.c +++ b/deps/miniupnpc/minissdpc.c @@ -227,9 +227,8 @@ requestDevicesFromMiniSSDPD(int s, const char * devtype) { unsigned char buffer[256]; unsigned char * p; - unsigned int stsize, l; - - stsize = strlen(devtype); + unsigned int l; + unsigned stsize = (unsigned)strlen(devtype); if(stsize == 8 && 0 == memcmp(devtype, "ssdp:all", 8)) { buffer[0] = 3; /* request type 3 : everything */ diff --git a/deps/miniupnpc/miniwget.c b/deps/miniupnpc/miniwget.c index 4c5446fe8239..b890a43f5e54 100644 --- a/deps/miniupnpc/miniwget.c +++ b/deps/miniupnpc/miniwget.c @@ -453,7 +453,7 @@ miniwget3(const char * host, /* sending the HTTP request */ while(sent < len) { - n = send(s, buf+sent, len-sent, 0); + n = (int)send(s, buf+sent, len-sent, 0); if(n < 0) { perror("send"); @@ -546,7 +546,7 @@ parseURL(const char * url, /* "%25" is just '%' in URL encoding */ if(scope[0] == '2' && scope[1] == '5') scope += 2; /* skip "25" */ - l = p2 - scope; + l = (int)(p2 - scope); if(l >= IF_NAMESIZE) l = IF_NAMESIZE - 1; memcpy(tmp, scope, l); diff --git a/deps/miniupnpc/receivedata.c b/deps/miniupnpc/receivedata.c index ef85a3db41a6..6f9d7ec0c921 100644 --- a/deps/miniupnpc/receivedata.c +++ b/deps/miniupnpc/receivedata.c @@ -85,9 +85,10 @@ receivedata(int socket, n = recvfrom(socket, data, length, 0, (struct sockaddr *)&src_addr, &src_addr_len); #else /* MINIUPNPC_GET_SRC_ADDR */ - n = recv(socket, data, length, 0); + n = (int)recv(socket, data, length, 0); #endif /* MINIUPNPC_GET_SRC_ADDR */ - if(n<0) { + if(n<0) + { PRINT_SOCKET_ERROR("recv"); } #ifdef MINIUPNPC_GET_SRC_ADDR diff --git a/deps/miniupnpc/upnpcommands.c b/deps/miniupnpc/upnpcommands.c index 50f3eecba6e3..2c162f01acd0 100644 --- a/deps/miniupnpc/upnpcommands.c +++ b/deps/miniupnpc/upnpcommands.c @@ -62,7 +62,7 @@ UPNP_GetTotalBytesReceived(const char * controlURL, /*DisplayNameValueList(buffer, bufsize);*/ free(buffer); buffer = NULL; p = GetValueFromNameValueList(&pdata, "NewTotalBytesReceived"); - r = my_atoui(p); + r = (unsigned)my_atoui(p); ClearNameValueList(&pdata); return r; } @@ -86,7 +86,7 @@ UPNP_GetTotalPacketsSent(const char * controlURL, /*DisplayNameValueList(buffer, bufsize);*/ free(buffer); buffer = NULL; p = GetValueFromNameValueList(&pdata, "NewTotalPacketsSent"); - r = my_atoui(p); + r = (unsigned)my_atoui(p); ClearNameValueList(&pdata); return r; } @@ -110,7 +110,7 @@ UPNP_GetTotalPacketsReceived(const char * controlURL, /*DisplayNameValueList(buffer, bufsize);*/ free(buffer); buffer = NULL; p = GetValueFromNameValueList(&pdata, "NewTotalPacketsReceived"); - r = my_atoui(p); + r = (unsigned)my_atoui(p); ClearNameValueList(&pdata); return r; } @@ -903,11 +903,11 @@ UPNP_GetFirewallStatus(const char * controlURL, if(ipa && fe) ret = UPNPCOMMAND_SUCCESS; if(fe) - *firewallEnabled = my_atoui(fe); + *firewallEnabled = (int)my_atoui(fe); /*else *firewallEnabled = 0;*/ if(ipa) - *inboundPinholeAllowed = my_atoui(ipa); + *inboundPinholeAllowed = (int)my_atoui(ipa); /*else *inboundPinholeAllowed = 0;*/ p = GetValueFromNameValueList(&pdata, "errorCode"); @@ -971,7 +971,7 @@ UPNP_GetOutboundPinholeTimeout(const char * controlURL, const char * servicetype ret = UPNPCOMMAND_SUCCESS; p = GetValueFromNameValueList(&pdata, "OutboundPinholeTimeout"); if(p) - *opTimeout = my_atoui(p); + *opTimeout = (int)my_atoui(p); } ClearNameValueList(&pdata); return ret; @@ -1175,8 +1175,8 @@ UPNP_CheckPinholeWorking(const char * controlURL, const char * servicetype, p = GetValueFromNameValueList(&pdata, "IsWorking"); if(p) { - *isWorking=my_atoui(p); - ret = UPNPCOMMAND_SUCCESS; + *isWorking = (int)my_atoui(p); + ret = UPNPCOMMAND_SUCCESS; } else *isWorking = 0; @@ -1222,8 +1222,8 @@ UPNP_GetPinholePackets(const char * controlURL, const char * servicetype, p = GetValueFromNameValueList(&pdata, "PinholePackets"); if(p) { - *packets=my_atoui(p); - ret = UPNPCOMMAND_SUCCESS; + *packets = (int)my_atoui(p); + ret = UPNPCOMMAND_SUCCESS; } p = GetValueFromNameValueList(&pdata, "errorCode"); diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index ba7fb246e559..077aa7dec97e 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -2748,7 +2748,7 @@ static int video_texture_load_wrap_gl_mipmap(void *data) return 0; video_texture_load_gl((struct texture_image*)data, TEXTURE_FILTER_MIPMAP_LINEAR, &id); - return id; + return (int)id; } static int video_texture_load_wrap_gl(void *data) @@ -2759,7 +2759,7 @@ static int video_texture_load_wrap_gl(void *data) return 0; video_texture_load_gl((struct texture_image*)data, TEXTURE_FILTER_LINEAR, &id); - return id; + return (int)id; } #endif diff --git a/gfx/drivers_font/gl_raster_font.c b/gfx/drivers_font/gl_raster_font.c index b34628d6f5aa..b6d9eafcf8d4 100644 --- a/gfx/drivers_font/gl_raster_font.c +++ b/gfx/drivers_font/gl_raster_font.c @@ -364,7 +364,7 @@ static void gl_raster_font_render_message( if (!font->font_driver->get_line_height) { gl_raster_font_render_line(font, - msg, strlen(msg), scale, color, pos_x, + msg, (unsigned)strlen(msg), scale, color, pos_x, pos_y, text_align); return; } @@ -375,7 +375,7 @@ static void gl_raster_font_render_message( for (;;) { const char *delim = strchr(msg, '\n'); - unsigned msg_len = delim ? (delim - msg) : strlen(msg); + unsigned msg_len = delim ? (unsigned)(delim - msg) : (unsigned)strlen(msg); /* Draw the line */ gl_raster_font_render_line(font, diff --git a/gfx/drivers_font_renderer/coretext.c b/gfx/drivers_font_renderer/coretext.c index d48b144a3691..9205e00f2287 100644 --- a/gfx/drivers_font_renderer/coretext.c +++ b/gfx/drivers_font_renderer/coretext.c @@ -231,7 +231,7 @@ static bool coretext_font_renderer_create_atlas(CTFontRef face, ct_font_renderer { for (c = 0; c < max_width; c++) { - unsigned src_idx = r * bytesPerRow + c; + unsigned src_idx = (unsigned)(r * bytesPerRow + c); unsigned dest_idx = (r + offset_y) * (CT_ATLAS_COLS * max_width) + (c + offset_x); uint8_t v = src[src_idx]; diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c index b49189c7d32c..eaaa587d8a35 100644 --- a/gfx/drivers_shader/shader_glsl.c +++ b/gfx/drivers_shader/shader_glsl.c @@ -1086,7 +1086,7 @@ static void gl_glsl_set_uniform_parameter( glUniform4fv(location, 1, param->result.floatv); break; case UNIFORM_1I: - glUniform1i(location, param->result.integer.v0); + glUniform1i(location, (GLint)param->result.integer.v0); break; } } @@ -1189,7 +1189,7 @@ static void gl_glsl_set_params(void *data, void *shader_data, { attr->loc = uni->orig.tex_coord; attr->size = 2; - attr->offset = size * sizeof(GLfloat); + attr->offset = (GLsizei)(size * sizeof(GLfloat)); attribs_size++; attr++; @@ -1225,7 +1225,7 @@ static void gl_glsl_set_params(void *data, void *shader_data, { attr->loc = uni->feedback.tex_coord; attr->size = 2; - attr->offset = size * sizeof(GLfloat); + attr->offset = (GLsizei)(size * sizeof(GLfloat)); attribs_size++; attr++; @@ -1261,7 +1261,7 @@ static void gl_glsl_set_params(void *data, void *shader_data, { attr->loc = uni->pass[i].tex_coord; attr->size = 2; - attr->offset = size * sizeof(GLfloat); + attr->offset = (GLsizei)(size * sizeof(GLfloat)); attribs_size++; attr++; @@ -1301,7 +1301,7 @@ static void gl_glsl_set_params(void *data, void *shader_data, { attr->loc = uni->prev[i].tex_coord; attr->size = 2; - attr->offset = size * sizeof(GLfloat); + attr->offset = (GLsizei)(size * sizeof(GLfloat)); attribs_size++; attr++; diff --git a/gfx/video_driver.c b/gfx/video_driver.c index 664dee098697..000f3f9e86c2 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -1042,7 +1042,7 @@ bool video_monitor_fps_statistics(double *refresh_rate, unsigned i; retro_time_t accum = 0, avg, accum_var = 0; unsigned samples = MIN(MEASURE_FRAME_TIME_SAMPLES_COUNT, - video_driver_frame_time_count); + (unsigned)video_driver_frame_time_count); if (video_driver_is_threaded() || (samples < 2)) return false; @@ -2181,7 +2181,7 @@ void video_driver_frame(const void *data, unsigned width, if (!current_video || !current_video->frame( video_driver_data, data, width, height, video_info.frame_count, - pitch, video_driver_msg, &video_info)) + (unsigned)pitch, video_driver_msg, &video_info)) video_driver_active = false; if (video_info.fps_show) diff --git a/gfx/video_filter.c b/gfx/video_filter.c index 5886025f5a59..7c6a35587b9d 100644 --- a/gfx/video_filter.c +++ b/gfx/video_filter.c @@ -388,7 +388,7 @@ rarch_softfilter_t *rarch_softfilter_new(const char *filter_config, enum retro_pixel_format in_pixel_format, unsigned max_width, unsigned max_height) { - softfilter_simd_mask_t cpu_features = cpu_features_get(); + softfilter_simd_mask_t cpu_features = (softfilter_simd_mask_t)cpu_features_get(); char basedir[PATH_MAX_LENGTH]; #ifdef HAVE_DYLIB char ext_name[PATH_MAX_LENGTH]; diff --git a/gfx/video_shader_parse.c b/gfx/video_shader_parse.c index b1a8329bcd4c..30442ec44ebb 100644 --- a/gfx/video_shader_parse.c +++ b/gfx/video_shader_parse.c @@ -184,7 +184,7 @@ static bool video_shader_parse_pass(config_file_t *conf, snprintf(frame_count_mod_buf, sizeof(frame_count_mod_buf), "frame_count_mod%u", i); if (config_get_array(conf, frame_count_mod_buf, frame_count_mod, sizeof(frame_count_mod))) - pass->frame_count_mod = strtoul(frame_count_mod, NULL, 0); + pass->frame_count_mod = (unsigned)strtoul(frame_count_mod, NULL, 0); /* FBO types and mipmapping */ snprintf(srgb_output_buf, sizeof(srgb_output_buf), "srgb_framebuffer%u", i); diff --git a/input/drivers/cocoa_input.c b/input/drivers/cocoa_input.c index 08177b664e94..701414e6b484 100644 --- a/input/drivers/cocoa_input.c +++ b/input/drivers/cocoa_input.c @@ -76,7 +76,7 @@ int32_t cocoa_input_find_any_button(uint32_t port) apple->joypad->poll(); if (apple->joypad->get_buttons) - ret = cocoa_input_find_any_button_ret(apple, apple->joypad->get_buttons(port), port); + ret = cocoa_input_find_any_button_ret(apple, (unsigned)apple->joypad->get_buttons(port), port); } if (ret != -1) @@ -89,7 +89,7 @@ int32_t cocoa_input_find_any_button(uint32_t port) if (apple->sec_joypad->get_buttons) { apple->sec_joypad->poll(); - ret = cocoa_input_find_any_button_ret(apple, apple->sec_joypad->get_buttons(port), port); + ret = cocoa_input_find_any_button_ret(apple, (unsigned)apple->sec_joypad->get_buttons(port), port); } } diff --git a/input/drivers_joypad/mfi_joypad.m b/input/drivers_joypad/mfi_joypad.m index a2df184c5b36..56f69024c967 100644 --- a/input/drivers_joypad/mfi_joypad.m +++ b/input/drivers_joypad/mfi_joypad.m @@ -144,7 +144,7 @@ static void apple_gamecontroller_joypad_connect(GCController *controller) if (!mfi_controllers[desired_index]) { controller.playerIndex = desired_index; - mfi_controllers[desired_index] = controller.hash; + mfi_controllers[desired_index] = (uint32_t)controller.hash; } else { @@ -156,7 +156,7 @@ static void apple_gamecontroller_joypad_connect(GCController *controller) if (mfi_controllers[i]) continue; - mfi_controllers[i] = controller.hash; + mfi_controllers[i] = (uint32_t)controller.hash; controller.playerIndex = i; break; } diff --git a/input/input_config.c b/input/input_config.c index 5c3fc2632dac..d57daad08ca6 100644 --- a/input/input_config.c +++ b/input/input_config.c @@ -358,7 +358,7 @@ void input_config_parse_joy_axis(void *data, const char *prefix, bind->joyaxis = AXIS_NONE; else if (strlen(tmp) >= 2 && (*tmp == '+' || *tmp == '-')) { - int i_axis = strtol(tmp + 1, NULL, 0); + int i_axis = (int)strtol(tmp + 1, NULL, 0); if (*tmp == '+') bind->joyaxis = AXIS_POS(i_axis); else diff --git a/input/input_driver.c b/input/input_driver.c index 470986d2d9f5..e861721da4cb 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -295,7 +295,7 @@ void input_poll(void) input_driver_turbo_btns.frame_enable[i] = current_input->input_state( current_input_data, joypad_info, libretro_input_binds, - i, RETRO_DEVICE_JOYPAD, 0, RARCH_TURBO_ENABLE); + (unsigned)i, RETRO_DEVICE_JOYPAD, 0, RARCH_TURBO_ENABLE); } } @@ -1069,7 +1069,7 @@ bool input_driver_find_driver(void) driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv); - i = drv.len; + i = (int)drv.len; if (i >= 0) current_input = (const input_driver_t*) diff --git a/input/input_keyboard.c b/input/input_keyboard.c index 9031fc0faa56..ddf97e9a7364 100644 --- a/input/input_keyboard.c +++ b/input/input_keyboard.c @@ -69,7 +69,7 @@ static void osk_update_last_codepoint(const char *word) for (;;) { unsigned codepoint = utf8_walk(&letter); - unsigned len = letter - pos; + unsigned len = (unsigned)(letter - pos); if (letter[0] == 0) { @@ -208,7 +208,7 @@ static bool input_keyboard_line_event( bool input_keyboard_line_append(const char *word) { unsigned i = 0; - unsigned len = strlen(word); + unsigned len = (unsigned)strlen(word); char *newbuf = (char*) realloc(g_keyboard_line->buffer, g_keyboard_line->size + len*2); diff --git a/input/input_overlay.c b/input/input_overlay.c index a252ebbb3d03..c690cdfff175 100644 --- a/input/input_overlay.c +++ b/input/input_overlay.c @@ -452,7 +452,7 @@ void input_overlay_next(input_overlay_t *ol, float opacity) input_overlay_load_active(ol, opacity); ol->blocked = true; - ol->next_index = (ol->index + 1) % ol->size; + ol->next_index = (unsigned)((ol->index + 1) % ol->size); } /** @@ -512,7 +512,7 @@ void input_overlay_loaded(void *task_data, void *user_data, const char *err) input_overlay_set_scale_factor(ol, data->overlay_scale); - ol->next_index = (ol->index + 1) % ol->size; + ol->next_index = (unsigned)((ol->index + 1) % ol->size); ol->state = OVERLAY_STATUS_NONE; ol->alive = true; overlay_ptr = ol; diff --git a/libretro-common/audio/dsp_filter.c b/libretro-common/audio/dsp_filter.c index 56b85b8f0af9..7ff162f325e0 100644 --- a/libretro-common/audio/dsp_filter.c +++ b/libretro-common/audio/dsp_filter.c @@ -155,7 +155,7 @@ static const dspfilter_get_implementation_t dsp_plugs_builtin[] = { static bool append_plugs(retro_dsp_filter_t *dsp, struct string_list *list) { unsigned i; - dspfilter_simd_mask_t mask = cpu_features_get(); + dspfilter_simd_mask_t mask = (dspfilter_simd_mask_t)cpu_features_get(); struct retro_dsp_plug *plugs = (struct retro_dsp_plug*) calloc(ARRAY_SIZE(dsp_plugs_builtin), sizeof(*plugs)); diff --git a/libretro-common/file/archive_file.c b/libretro-common/file/archive_file.c index 6081c7a43556..e48ebfb8c8b6 100644 --- a/libretro-common/file/archive_file.c +++ b/libretro-common/file/archive_file.c @@ -708,7 +708,7 @@ static struct string_list *file_archive_filename_split(const char *path) if (delim) { /* add archive path to list first */ - if (!string_list_append_n(list, path, delim - path, attr)) + if (!string_list_append_n(list, path, (unsigned)(delim - path), attr)) goto error; /* now add the path within the archive */ diff --git a/libretro-common/file/archive_file_zlib.c b/libretro-common/file/archive_file_zlib.c index b0d56af2ba55..2ccb2eff8e6d 100644 --- a/libretro-common/file/archive_file_zlib.c +++ b/libretro-common/file/archive_file_zlib.c @@ -269,7 +269,7 @@ static int zip_file_read( if (!userdata.decomp_state.found) return -1; - return userdata.decomp_state.size; + return (int)userdata.decomp_state.size; } static int zip_parse_file_init(file_archive_transfer_t *state, diff --git a/libretro-common/file/config_file.c b/libretro-common/file/config_file.c index 2b1714e981df..a9a2dad994d2 100644 --- a/libretro-common/file/config_file.c +++ b/libretro-common/file/config_file.c @@ -621,7 +621,7 @@ bool config_get_int(config_file_t *conf, const char *key, int *in) if (entry) { - int val = strtol(entry->value, NULL, 0); + int val = (int)strtol(entry->value, NULL, 0); if (errno == 0) *in = val; @@ -655,7 +655,7 @@ bool config_get_uint(config_file_t *conf, const char *key, unsigned *in) if (entry) { - unsigned val = strtoul(entry->value, NULL, 0); + unsigned val = (unsigned)strtoul(entry->value, NULL, 0); if (errno == 0) *in = val; @@ -671,7 +671,7 @@ bool config_get_hex(config_file_t *conf, const char *key, unsigned *in) if (entry) { - unsigned val = strtoul(entry->value, NULL, 16); + unsigned val = (unsigned)strtoul(entry->value, NULL, 16); if (errno == 0) *in = val; diff --git a/libretro-common/file/config_file_userdata.c b/libretro-common/file/config_file_userdata.c index 48c41a5f3d55..022715ac1cda 100644 --- a/libretro-common/file/config_file_userdata.c +++ b/libretro-common/file/config_file_userdata.c @@ -80,7 +80,7 @@ int config_userdata_get_float_array(void *userdata, const char *key_str, *values = (float*)calloc(list->size, sizeof(float)); for (i = 0; i < list->size; i++) (*values)[i] = (float)strtod(list->elems[i].data, NULL); - *out_num_values = list->size; + *out_num_values = (unsigned)list->size; string_list_free(list); free(str); return true; @@ -110,7 +110,7 @@ int config_userdata_get_int_array(void *userdata, const char *key_str, *values = (int*)calloc(list->size, sizeof(int)); for (i = 0; i < list->size; i++) (*values)[i] = (int)strtod(list->elems[i].data, NULL); - *out_num_values = list->size; + *out_num_values = (unsigned)list->size; string_list_free(list); free(str); return true; diff --git a/libretro-common/file/retro_stat.c b/libretro-common/file/retro_stat.c index 372cbde020d1..e8df2aff8e5c 100644 --- a/libretro-common/file/retro_stat.c +++ b/libretro-common/file/retro_stat.c @@ -116,7 +116,7 @@ static bool path_stat(const char *path, enum stat_mode mode, int32_t *size) #endif if (size) - *size = buf.st_size; + *size = (int32_t)buf.st_size; switch (mode) { diff --git a/libretro-common/formats/tga/rtga.c b/libretro-common/formats/tga/rtga.c index 200b85c6515d..87ed7194177a 100644 --- a/libretro-common/formats/tga/rtga.c +++ b/libretro-common/formats/tga/rtga.c @@ -402,7 +402,7 @@ int rtga_process_image(rtga_t *rtga, void **buf_data, return IMAGE_PROCESS_ERROR; rtga->output_image = (uint32_t*)rtga_load_from_memory(rtga->buff_data, - size, width, height, &comp, 4); + (int)size, width, height, &comp, 4); *buf_data = rtga->output_image; size_tex = (*width) * (*height); diff --git a/libretro-common/hash/rhash.c b/libretro-common/hash/rhash.c index 4282670f8043..8eb2bb58d720 100644 --- a/libretro-common/hash/rhash.c +++ b/libretro-common/hash/rhash.c @@ -191,7 +191,7 @@ void sha256_hash(char *s, const uint8_t *in, size_t size) } shahash; sha256_init(&sha); - sha256_chunk(&sha, in, size); + sha256_chunk(&sha, in, (unsigned)size); sha256_final(&sha); sha256_subhash(&sha, shahash.u32); @@ -522,7 +522,7 @@ int sha1_calculate(const char *path, char *result) do { - rv = filestream_read(fd, buff, 4096); + rv = (int)filestream_read(fd, buff, 4096); if (rv < 0) goto error; diff --git a/libretro-common/lists/file_list.c b/libretro-common/lists/file_list.c index 805486523f6e..d0166755588a 100644 --- a/libretro-common/lists/file_list.c +++ b/libretro-common/lists/file_list.c @@ -104,7 +104,7 @@ bool file_list_prepend(file_list_t *list, if (!file_list_expand_if_needed(list)) return false; - for (i = list->size; i > 0; i--) + for (i = (unsigned)list->size; i > 0; i--) { struct item_file *copy = (struct item_file*) calloc(1, sizeof(struct item_file)); @@ -131,7 +131,7 @@ bool file_list_append(file_list_t *list, if (!file_list_expand_if_needed(list)) return false; - file_list_add(list, list->size, path, label, type, + file_list_add(list, (unsigned)list->size, path, label, type, directory_ptr, entry_idx); return true; diff --git a/libretro-common/lists/string_list.c b/libretro-common/lists/string_list.c index b2b4fc038d8c..3ed16cb0dd3c 100644 --- a/libretro-common/lists/string_list.c +++ b/libretro-common/lists/string_list.c @@ -269,7 +269,7 @@ int string_list_find_elem(const struct string_list *list, const char *elem) for (i = 0; i < list->size; i++) { if (strcasecmp(list->elems[i].data, elem) == 0) - return i+1; + return (int)(i + 1); } return false; diff --git a/libretro-common/net/net_http.c b/libretro-common/net/net_http.c index 90a087d74ae1..317d72438482 100644 --- a/libretro-common/net/net_http.c +++ b/libretro-common/net/net_http.c @@ -202,7 +202,7 @@ bool net_http_connection_done(struct http_connection_t *conn) if (!isdigit((int)conn->scan[1])) return false; - conn->port = strtoul(conn->scan + 1, &conn->scan, 10); + conn->port = (int)strtoul(conn->scan + 1, &conn->scan, 10); if (*conn->scan != '/') return false; @@ -341,7 +341,7 @@ bool net_http_update(struct http_t *state, size_t* progress, size_t* total) { if (strncmp(state->data, "HTTP/1.", strlen("HTTP/1."))!=0) goto fail; - state->status = strtoul(state->data + strlen("HTTP/1.1 "), NULL, 10); + state->status = (int)strtoul(state->data + strlen("HTTP/1.1 "), NULL, 10); state->part = P_HEADER; } else diff --git a/libretro-common/net/net_socket.c b/libretro-common/net/net_socket.c index 796dda418804..be945b770f79 100644 --- a/libretro-common/net/net_socket.c +++ b/libretro-common/net/net_socket.c @@ -84,7 +84,7 @@ ssize_t socket_receive_all_nonblocking(int fd, bool *error, return -1; } - if (isagain(ret)) + if (isagain((int)ret)) return 0; *error = true; @@ -171,7 +171,7 @@ int socket_send_all_blocking(int fd, const void *data_, size_t size, no_signal ? MSG_NOSIGNAL : 0); if (ret <= 0) { - if (isagain(ret)) + if (isagain((int)ret)) continue; return false; @@ -196,15 +196,13 @@ ssize_t socket_send_all_nonblocking(int fd, const void *data_, size_t size, no_signal ? MSG_NOSIGNAL : 0); if (ret < 0) { - if (isagain(ret)) + if (isagain((int)ret)) break; return -1; } else if (ret == 0) - { break; - } data += ret; size -= ret; diff --git a/libretro-common/streams/file_stream.c b/libretro-common/streams/file_stream.c index 46d99f61c295..950d66c1d488 100644 --- a/libretro-common/streams/file_stream.c +++ b/libretro-common/streams/file_stream.c @@ -319,7 +319,7 @@ char *filestream_gets(RFILE *stream, char *s, size_t len) if (!stream) return NULL; #if defined(HAVE_BUFFERED_IO) - return fgets(s, len, stream->fp); + return fgets(s, (int)len, stream->fp); #elif defined(PSP) if(filestream_read(stream,s,len)==len) return s; diff --git a/libretro-common/streams/interface_stream.c b/libretro-common/streams/interface_stream.c index 61708b1dc0bb..1760b2256ead 100644 --- a/libretro-common/streams/interface_stream.c +++ b/libretro-common/streams/interface_stream.c @@ -148,9 +148,9 @@ int intfstream_seek(intfstream_internal_t *intf, int offset, int whence) switch (intf->type) { case INTFSTREAM_FILE: - return filestream_seek(intf->file.fp, offset, whence); + return (int)filestream_seek(intf->file.fp, (int)offset, whence); case INTFSTREAM_MEMORY: - return memstream_seek(intf->memory.fp, offset, whence); + return (int)memstream_seek(intf->memory.fp, offset, whence); } return -1; @@ -230,9 +230,9 @@ int intfstream_tell(intfstream_internal_t *intf) switch (intf->type) { case INTFSTREAM_FILE: - return filestream_tell(intf->file.fp); + return (int)filestream_tell(intf->file.fp); case INTFSTREAM_MEMORY: - return memstream_pos(intf->memory.fp); + return (int)memstream_pos(intf->memory.fp); } return -1; diff --git a/libretro-db/libretrodb.c b/libretro-db/libretrodb.c index c39663db2fe0..10ad383f14c5 100644 --- a/libretro-db/libretrodb.c +++ b/libretro-db/libretrodb.c @@ -194,8 +194,8 @@ static void libretrodb_write_index_header(RFILE *fd, libretrodb_index_t *idx) { rmsgpack_write_map_header(fd, 3); rmsgpack_write_string(fd, "name", strlen("name")); - rmsgpack_write_string(fd, idx->name, strlen(idx->name)); - rmsgpack_write_string(fd, "key_size", strlen("key_size")); + rmsgpack_write_string(fd, idx->name, (uint32_t)strlen(idx->name)); + rmsgpack_write_string(fd, "key_size", (uint32_t)strlen("key_size")); rmsgpack_write_uint(fd, idx->key_size); rmsgpack_write_string(fd, "next", strlen("next")); rmsgpack_write_uint(fd, idx->next); @@ -221,7 +221,7 @@ int libretrodb_open(const char *path, libretrodb_t *db) strlcpy(db->path, path, sizeof(db->path)); db->root = filestream_seek(fd, 0, SEEK_CUR); - if ((rv = filestream_read(fd, &header, sizeof(header))) == -1) + if ((rv = (int)filestream_read(fd, &header, sizeof(header))) == -1) { rv = -errno; goto error; @@ -281,7 +281,7 @@ static int node_compare(const void *a, const void *b, void *ctx) static int binsearch(const void *buff, const void *item, uint64_t count, uint8_t field_size, uint64_t *offset) { - int mid = count / 2; + int mid = (int)(count / 2); int item_size = field_size + sizeof(uint64_t); uint64_t *current = (uint64_t *)buff + (mid * item_size); int rv = node_compare(current, item, &field_size); @@ -323,7 +323,7 @@ int libretrodb_find_entry(libretrodb_t *db, const char *index_name, while (nread < bufflen) { void *buff_ = (uint64_t *)buff + nread; - rv = filestream_read(db->fd, buff_, bufflen - nread); + rv = (int)filestream_read(db->fd, buff_, bufflen - nread); if (rv <= 0) { @@ -353,7 +353,7 @@ int libretrodb_find_entry(libretrodb_t *db, const char *index_name, int libretrodb_cursor_reset(libretrodb_cursor_t *cursor) { cursor->eof = 0; - return filestream_seek(cursor->fd, + return (int)filestream_seek(cursor->fd, (ssize_t)(cursor->db->root + sizeof(libretrodb_header_t)), SEEK_SET); } diff --git a/libretro-db/query.c b/libretro-db/query.c index 03e1ea0c91d4..cb2550947e78 100644 --- a/libretro-db/query.c +++ b/libretro-db/query.c @@ -866,8 +866,8 @@ static struct buffer query_parse_table(struct buffer buff, if (!*error) { - args[argi].a.value.type = RDT_STRING; - args[argi].a.value.val.string.len = ident_len; + args[argi].a.value.type = RDT_STRING; + args[argi].a.value.val.string.len = ident_len; args[argi].a.value.val.string.buff = (char*)calloc( ident_len + 1, sizeof(char) diff --git a/libretro-db/rmsgpack_dom.c b/libretro-db/rmsgpack_dom.c index 0cff0464abcb..8335bb4ef845 100644 --- a/libretro-db/rmsgpack_dom.c +++ b/libretro-db/rmsgpack_dom.c @@ -463,8 +463,8 @@ int rmsgpack_dom_read_into(RFILE *fd, ...) if (!key_name) goto clean; - key.type = RDT_STRING; - key.val.string.len = strlen(key_name); + key.type = RDT_STRING; + key.val.string.len = (uint32_t)strlen(key_name); key.val.string.buff = (char *) key_name; value = rmsgpack_dom_value_map_value(&map, &key); diff --git a/location/location_driver.c b/location/location_driver.c index db4ab793486f..94ea6c2e35cf 100644 --- a/location/location_driver.c +++ b/location/location_driver.c @@ -101,7 +101,7 @@ void find_location_driver(void) driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv); - i = drv.len; + i = (int)drv.len; if (i >= 0) location_driver = (const location_driver_t*)location_driver_find_handle(i); diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index 26482d35bbad..ea92d6bf8620 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -419,7 +419,7 @@ static void menu_action_setting_disp_set_label_menu_file_core( menu_entries_get_at_offset(list, i, NULL, NULL, NULL, NULL, &alt); - *w = strlen(s); + *w = (unsigned)strlen(s); if (alt) strlcpy(s2, alt, len2); } @@ -1099,7 +1099,7 @@ static void menu_action_setting_generic_disp_set_label( if (label) strlcpy(s, label, len); - *w = strlen(s); + *w = (unsigned)strlen(s); strlcpy(s2, path, len2); } @@ -1314,7 +1314,7 @@ static void menu_action_setting_disp_set_label_menu_file_url_core( menu_entries_get_at_offset(list, i, NULL, NULL, NULL, NULL, &alt); - *w = strlen(s); + *w = (unsigned)strlen(s); if (alt) strlcpy(s2, alt, len2); } diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c index 2cedf6985986..6a27baa27b78 100644 --- a/menu/cbs/menu_cbs_left.c +++ b/menu/cbs/menu_cbs_left.c @@ -345,7 +345,7 @@ static int playlist_association_left(unsigned type, const char *label, if (next < 0) { if (wraparound) - next = list->count; + next = (int)(list->count); else next = 0; } diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 016ec301278a..44a281d26ff9 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -328,7 +328,7 @@ int generic_action_ok_displaylist_push(const char *path, info_label = msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_RPL_ENTRY_ACTIONS); info.enum_idx = MENU_ENUM_LABEL_DEFERRED_RPL_ENTRY_ACTIONS; info.directory_ptr = idx; - rpl_entry_selection_ptr = idx; + rpl_entry_selection_ptr = (unsigned)idx; dl_type = DISPLAYLIST_GENERIC; break; case ACTION_OK_DL_AUDIO_DSP_PLUGIN: @@ -634,7 +634,7 @@ int generic_action_ok_displaylist_push(const char *path, break; case ACTION_OK_DL_DEFERRED_CORE_LIST_SET: info.directory_ptr = idx; - rdb_entry_start_game_selection_ptr = idx; + rdb_entry_start_game_selection_ptr = (unsigned)idx; info_path = settings->directory.libretro; info_label = msg_hash_to_str( MENU_ENUM_LABEL_DEFERRED_CORE_LIST_SET); @@ -1115,7 +1115,7 @@ static int generic_action_ok(const char *path, case ACTION_OK_LOAD_SHADER_PASS: { struct video_shader_pass *shader_pass = menu_shader_manager_get_pass(hack_shader_pass); - flush_char = msg_hash_to_str(flush_id); + flush_char = msg_hash_to_str((unsigned)flush_id); strlcpy( shader_pass->source.path, action_path, @@ -1428,7 +1428,7 @@ static int action_ok_playlist_entry_collection(const char *path, } playlist_info.data = playlist; - playlist_info.idx = selection_ptr; + playlist_info.idx = (unsigned)selection_ptr; if (!menu_content_playlist_load(&playlist_info)) { @@ -1518,7 +1518,7 @@ static int action_ok_playlist_entry(const char *path, } playlist_info.data = playlist; - playlist_info.idx = selection_ptr; + playlist_info.idx = (unsigned)selection_ptr; if (!menu_content_playlist_load(&playlist_info)) { @@ -1626,7 +1626,7 @@ static int action_ok_playlist_entry_start_content(const char *path, } playlist_info.data = playlist; - playlist_info.idx = selection_ptr; + playlist_info.idx = (unsigned)selection_ptr; if (!menu_content_playlist_load(&playlist_info)) { @@ -1780,7 +1780,7 @@ static int action_ok_cheat(const char *path, line.label = msg_hash_to_str(MSG_INPUT_CHEAT); line.label_setting = label; line.type = type; - line.idx = idx; + line.idx = (unsigned)idx; line.cb = menu_input_st_cheat_cb; if (!menu_input_dialog_start(&line)) @@ -1829,7 +1829,7 @@ static int action_ok_shader_preset_save_as(const char *path, line.label = msg_hash_to_str(MSG_INPUT_PRESET_FILENAME); line.label_setting = label; line.type = type; - line.idx = idx; + line.idx = (unsigned)idx; line.cb = menu_input_st_string_cb_save_preset; if (!menu_input_dialog_start(&line)) @@ -1949,7 +1949,7 @@ static int action_ok_cheat_file_save_as(const char *path, line.label = msg_hash_to_str(MSG_INPUT_CHEAT_FILENAME); line.label_setting = label; line.type = type; - line.idx = idx; + line.idx = (unsigned)idx; line.cb = menu_input_st_string_cb_cheat_file_save_as; if (!menu_input_dialog_start(&line)) @@ -2301,7 +2301,7 @@ static void cb_decompressed(void *task_data, void *user_data, const char *err) if (dec && !err) { - unsigned type_hash = (uintptr_t)user_data; + unsigned type_hash = (unsigned)(uintptr_t)user_data; switch (type_hash) { @@ -3273,7 +3273,7 @@ static int action_ok_wifi(const char *path, line.label = "Passphrase"; line.label_setting = label; line.type = type; - line.idx = idx; + line.idx = (unsigned)idx; line.cb = menu_input_wifi_cb; if (!menu_input_dialog_start(&line)) @@ -3426,7 +3426,7 @@ static void netplay_refresh_rooms_cb(void *task_data, void *user_data, const cha if (netplay_room_list) free(netplay_room_list); - netplay_room_count = room_data->size / 8; + netplay_room_count = (int)(room_data->size / 8); netplay_room_list = (struct netplay_room*) malloc(sizeof(struct netplay_room) * netplay_room_count); diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c index 2f5148c9fb4f..e63ec2da2ab6 100644 --- a/menu/cbs/menu_cbs_right.c +++ b/menu/cbs/menu_cbs_right.c @@ -88,7 +88,7 @@ int shader_action_parameter_preset_right(unsigned type, const char *label, int generic_action_cheat_toggle(size_t idx, unsigned type, const char *label, bool wraparound) { - cheat_manager_toggle_index(idx); + cheat_manager_toggle_index((unsigned)idx); return 0; } @@ -354,7 +354,7 @@ static int playlist_association_right(unsigned type, const char *label, found = string_list_find_elem(stnames, path); if (found && info) - string_list_set(stcores, found-1, info->path); + string_list_set(stcores, (unsigned)(found-1), info->path); string_list_join_concat(new_playlist_cores, sizeof(new_playlist_cores), stcores, ";"); diff --git a/menu/cbs/menu_cbs_scan.c b/menu/cbs/menu_cbs_scan.c index 7867d31f6966..a9f2371ddda1 100644 --- a/menu/cbs/menu_cbs_scan.c +++ b/menu/cbs/menu_cbs_scan.c @@ -133,7 +133,7 @@ static int action_scan_input_desc(const char *path, unsigned char player_no_str = atoi(&label[1]); inp_desc_user = (unsigned)(player_no_str - 1); - key = idx - 6; + key = (unsigned)(idx - 6); } else key = input_config_translate_str_to_bind_id(label); diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c index a6fd4b8ce57a..6d404d61d432 100644 --- a/menu/cbs/menu_cbs_select.c +++ b/menu/cbs/menu_cbs_select.c @@ -94,7 +94,7 @@ static int action_select_default(const char *path, const char *label, unsigned t } if (action != MENU_ACTION_NOOP) - ret = menu_entry_action(&entry, idx, action); + ret = menu_entry_action(&entry, (unsigned)idx, action); task_queue_ctl(TASK_QUEUE_CTL_CHECK, NULL); diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c index 0cb658ed756c..84ef967490cb 100644 --- a/menu/cbs/menu_cbs_start.c +++ b/menu/cbs/menu_cbs_start.c @@ -149,7 +149,7 @@ static int action_start_shader_pass(unsigned type, const char *label) { hack_shader_pass = type - MENU_SETTINGS_SHADER_PASS_0; - menu_shader_manager_clear_pass_path(hack_shader_pass); + menu_shader_manager_clear_pass_path((unsigned)hack_shader_pass); return 0; } diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 8707e5095cf3..1efbab7a9645 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -388,7 +388,8 @@ static void mui_draw_tab_end(mui_handle_t *mui, /* active tab marker */ unsigned tab_width = width / (MUI_SYSTEM_TAB_END+1); - menu_display_draw_quad(mui->categories.selection_ptr * tab_width, + menu_display_draw_quad( + (int)(mui->categories.selection_ptr * tab_width), height - (header_height/16), tab_width, header_height/16, @@ -474,13 +475,13 @@ static void mui_render_messagebox(mui_handle_t *mui, y_position = height / 4; x = width / 2; - y = y_position - (list->size-1) * line_height / 2; + y = (int)(y_position - (list->size-1) * line_height / 2); /* find the longest line width */ for (i = 0; i < list->size; i++) { const char *msg = list->elems[i].data; - int len = utf8len(msg); + int len = (int)utf8len(msg); if (len > longest) { longest = len; @@ -667,7 +668,7 @@ static void mui_render_label_value(mui_handle_t *mui, mui_node_t *node, char sublabel_str[255]; char value_str[255]; bool switch_is_on = true; - int value_len = utf8len(value); + int value_len = (int)utf8len(value); int ticker_limit = 0; uintptr_t texture_switch = 0; bool do_draw_text = false; @@ -682,9 +683,9 @@ static void mui_render_label_value(mui_handle_t *mui, mui_node_t *node, sublabel_str[0] = '\0'; if (value_len * mui->glyph_width > usable_width / 2) - value_len = (usable_width/2) / mui->glyph_width; + value_len = (int)((usable_width/2) / mui->glyph_width); - ticker_limit = (usable_width / mui->glyph_width) - (value_len + 2); + ticker_limit = (int)((usable_width / mui->glyph_width) - (value_len + 2)); ticker.s = label_str; ticker.len = ticker_limit; @@ -827,15 +828,15 @@ static void mui_render_menu_list( || ((y + (int)node->line_height) < 0)) continue;*/ - menu_entry_get_value(i, NULL, entry_value, sizeof(entry_value)); - menu_entry_get_rich_label(i, rich_label, sizeof(rich_label)); + menu_entry_get_value((unsigned)i, NULL, entry_value, sizeof(entry_value)); + menu_entry_get_rich_label((unsigned)i, rich_label, sizeof(rich_label)); entry_selected = selection == i; mui_render_label_value( mui, node, - i, + (int)i, y, width, height, @@ -1367,8 +1368,8 @@ static void mui_frame(void *data, video_frame_info_t *video_info) snprintf(title_buf_msg, sizeof(title_buf), "%s (%s)", title_buf, title_msg); - value_len = utf8len(title_buf); - ticker_limit = (usable_width / mui->glyph_width) - (value_len + 2); + value_len = (int)utf8len(title_buf); + ticker_limit = (int)((usable_width / mui->glyph_width) - (value_len + 2)); ticker.s = title_buf_msg_tmp; ticker.len = ticker_limit; @@ -1750,7 +1751,7 @@ static void mui_list_cache(void *data, if (mui->categories.selection_ptr == 0) { mui->categories.selection_ptr = list_size; - mui->categories.active.idx = list_size - 1; + mui->categories.active.idx = (unsigned)(list_size - 1); } else mui->categories.selection_ptr--; @@ -1916,7 +1917,7 @@ static int mui_pointer_tap(void *userdata, if (y < header_height) { menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection); - return menu_entry_action(entry, selection, MENU_ACTION_CANCEL); + return menu_entry_action(entry, (unsigned)selection, MENU_ACTION_CANCEL); } else if (y > height - mui->tabs_height) { @@ -1946,7 +1947,7 @@ static int mui_pointer_tap(void *userdata, bool scroll = false; menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection); if (ptr == selection && cbs && cbs->action_select) - return menu_entry_action(entry, selection, MENU_ACTION_SELECT); + return menu_entry_action(entry, (unsigned)selection, MENU_ACTION_SELECT); idx = ptr; @@ -1966,7 +1967,7 @@ static void mui_list_insert(void *userdata, { size_t selection; float scale_factor; - int i = list_size; + int i = (int)list_size; mui_node_t *node = NULL; mui_handle_t *mui = (mui_handle_t*)userdata; diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c index debe9e65a362..05541db419a9 100644 --- a/menu/drivers/menu_generic.c +++ b/menu/drivers/menu_generic.c @@ -232,7 +232,7 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action) selection = MAX(MIN(selection, (menu_entries_get_size() - 1)), 0); menu_entry_get(&entry, 0, selection, NULL, false); - ret = menu_entry_action(&entry, selection, (enum menu_action)action); + ret = menu_entry_action(&entry, (unsigned)selection, (enum menu_action)action); if (ret) goto end; diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index c0e02d8c443a..d8f7a8927a33 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -579,8 +579,8 @@ static void rgui_render(void *data) char message[255]; char entry_title_buf[255]; char type_str_buf[255]; - unsigned entry_spacing = menu_entry_get_spacing(i); - bool entry_selected = menu_entry_is_currently_selected(i); + unsigned entry_spacing = menu_entry_get_spacing((unsigned)i); + bool entry_selected = menu_entry_is_currently_selected((unsigned)i); if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) continue; @@ -594,8 +594,8 @@ static void rgui_render(void *data) entry_title_buf[0] = '\0'; type_str_buf[0] = '\0'; - menu_entry_get_value(i, NULL, entry_value, sizeof(entry_value)); - menu_entry_get_rich_label(i, entry_path, sizeof(entry_path)); + menu_entry_get_value((unsigned)i, NULL, entry_value, sizeof(entry_value)); + menu_entry_get_rich_label((unsigned)i, entry_path, sizeof(entry_path)); ticker.s = entry_title_buf; ticker.len = RGUI_TERM_WIDTH(fb_width) - (entry_spacing + 1 + 2); @@ -855,7 +855,7 @@ static int rgui_pointer_tap(void *data, if (y < header_height) { menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection); - return menu_entry_action(entry, selection, MENU_ACTION_CANCEL); + return menu_entry_action(entry, (unsigned)selection, MENU_ACTION_CANCEL); } else if (ptr <= (menu_entries_get_size() - 1)) { @@ -863,7 +863,7 @@ static int rgui_pointer_tap(void *data, bool scroll = false; menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection); if (ptr == selection && cbs && cbs->action_select) - return menu_entry_action(entry, selection, MENU_ACTION_SELECT); + return menu_entry_action(entry, (unsigned)selection, MENU_ACTION_SELECT); idx = ptr; diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index f0edf4ec52c4..58b57c8c6cc0 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -834,7 +834,8 @@ static void xmb_render_messagebox_internal( for (i = 0; i < list->size; i++) { const char *msg = list->elems[i].data; - int len = utf8len(msg); + int len = (int)utf8len(msg); + if (len > longest) { longest = len; @@ -1072,12 +1073,12 @@ static void xmb_selection_pointer_changed( if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) return; - end = menu_entries_get_end(); + end = (unsigned)menu_entries_get_end(); threshold = xmb->icon.size*10; video_driver_get_size(NULL, &height); - tag.id = (uintptr_t)menu_list; + tag.id = (int)(uintptr_t)menu_list; menu_animation_ctl(MENU_ANIMATION_CTL_KILL_BY_TAG, &tag); menu_entries_ctl(MENU_ENTRIES_CTL_SET_START, &num); @@ -1098,7 +1099,7 @@ static void xmb_selection_pointer_changed( if (i == selection) { - unsigned depth = xmb_list_get_size(xmb, MENU_LIST_PLAIN); + unsigned depth = (unsigned)xmb_list_get_size(xmb, MENU_LIST_PLAIN); ia = xmb->items.active.alpha; iz = xmb->items.active.zoom; @@ -1577,7 +1578,7 @@ static void xmb_list_switch(xmb_handle_t *xmb) xmb_list_switch_old(xmb, xmb->selection_buf_old, dir, xmb->selection_ptr_old); xmb_list_switch_new(xmb, selection_buf, dir, selection); - xmb->categories.active.idx_old = xmb->categories.selection_ptr; + xmb->categories.active.idx_old = (unsigned)xmb->categories.selection_ptr; if (!string_is_equal(xmb_thumbnails_ident(), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF))) @@ -1678,7 +1679,7 @@ static void xmb_init_horizontal_list(xmb_handle_t *xmb) { size_t i; for (i=0; i < xmb->horizontal_list->size; i++) - xmb_node_allocate_userdata(xmb, i); + xmb_node_allocate_userdata(xmb, (unsigned)i); menu_displaylist_ctl(DISPLAYLIST_PROCESS, &info); } } @@ -1862,7 +1863,7 @@ static void xmb_list_open(xmb_handle_t *xmb) if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) return; - xmb->depth = xmb_list_get_size(xmb, MENU_LIST_PLAIN); + xmb->depth = (int)xmb_list_get_size(xmb, MENU_LIST_PLAIN); if (xmb->depth > xmb->old_depth) dir = 1; @@ -2001,7 +2002,7 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb, return core_node->content_icon; #if defined(HAVE_IMAGEVIEWER) || defined(HAVE_FFMPEG) - switch (xmb_get_system_tab(xmb, xmb->categories.selection_ptr)) + switch (xmb_get_system_tab(xmb, (unsigned)xmb->categories.selection_ptr)) { #ifdef HAVE_IMAGEVIEWER case XMB_SYSTEM_TAB_IMAGES: @@ -2223,7 +2224,7 @@ static void xmb_draw_items( ticker_limit = 70; } - menu_entry_get_rich_label(i, ticker_str, sizeof(ticker_str)); + menu_entry_get_rich_label((unsigned)i, ticker_str, sizeof(ticker_str)); ticker.s = name; ticker.len = ticker_limit; @@ -2350,7 +2351,7 @@ static void xmb_render(void *data) menu_animation_ctx_delta_t delta; settings_t *settings = config_get_ptr(); xmb_handle_t *xmb = (xmb_handle_t*)data; - unsigned end = menu_entries_get_size(); + unsigned end = (unsigned)menu_entries_get_size(); if (!xmb) return; @@ -2372,7 +2373,7 @@ static void xmb_render(void *data) for (i = 0; i < end; i++) { float item_y1 = xmb->margins.screen.top - + xmb_item_y(xmb, i, selection); + + xmb_item_y(xmb, (int)i, selection); float item_y2 = item_y1 + xmb->icon.size; int16_t pointer_y = menu_input_pointer_state(MENU_POINTER_Y_AXIS); int16_t mouse_y = menu_input_mouse_state(MENU_MOUSE_Y_AXIS) @@ -3059,8 +3060,8 @@ static void xmb_layout(xmb_handle_t *xmb) else xmb_layout_psp(xmb, width); - current = selection; - end = menu_entries_get_end(); + current = (unsigned)selection; + end = (unsigned)menu_entries_get_end(); for (i = 0; i < end; i++) { @@ -3087,8 +3088,8 @@ static void xmb_layout(xmb_handle_t *xmb) if (xmb->depth <= 1) return; - current = xmb->selection_ptr_old; - end = file_list_get_size(xmb->selection_buf_old); + current = (unsigned)xmb->selection_ptr_old; + end = (unsigned)file_list_get_size(xmb->selection_buf_old); for (i = 0; i < end; i++) { @@ -3579,7 +3580,7 @@ static void xmb_list_insert(void *userdata, { size_t selection; int current = 0; - int i = list_size; + int i = (int)list_size; xmb_node_t *node = NULL; xmb_handle_t *xmb = (xmb_handle_t*)userdata; @@ -3599,7 +3600,7 @@ static void xmb_list_insert(void *userdata, return; } - current = selection; + current = (int)selection; if (!string_is_empty(fullpath)) strlcpy(node->fullpath, fullpath, sizeof(node->fullpath)); @@ -3738,7 +3739,7 @@ static void xmb_list_cache(void *data, enum menu_list_type type, unsigned action if (xmb->categories.selection_ptr == 0) { xmb->categories.selection_ptr = list_size; - xmb->categories.active.idx = list_size - 1; + xmb->categories.active.idx = (unsigned)(list_size - 1); } else xmb->categories.selection_ptr--; @@ -3760,7 +3761,7 @@ static void xmb_list_cache(void *data, enum menu_list_type type, unsigned action free(menu_stack->list[stack_size - 1].label); menu_stack->list[stack_size - 1].label = NULL; - switch (xmb_get_system_tab(xmb, xmb->categories.selection_ptr)) + switch (xmb_get_system_tab(xmb, (unsigned)xmb->categories.selection_ptr)) { case XMB_SYSTEM_TAB_MAIN: menu_stack->list[stack_size - 1].label = @@ -3860,7 +3861,7 @@ static void xmb_toggle(void *userdata, bool menu_on) if (!xmb) return; - xmb->depth = xmb_list_get_size(xmb, MENU_LIST_PLAIN); + xmb->depth = (int)xmb_list_get_size(xmb, MENU_LIST_PLAIN); if (!menu_on) { diff --git a/menu/menu_animation.c b/menu/menu_animation.c index 66c688b89b3d..47acd52d29b4 100644 --- a/menu/menu_animation.c +++ b/menu/menu_animation.c @@ -289,15 +289,15 @@ static float easing_out_in_bounce(float t, float b, float c, float d) static void menu_animation_ticker_generic(uint64_t idx, size_t max_width, size_t *offset, size_t *width) { - int ticker_period = 2 * (*width - max_width) + 4; + int ticker_period = (int)(2 * (*width - max_width) + 4); int phase = idx % ticker_period; int phase_left_stop = 2; - int phase_left_moving = phase_left_stop + (*width - max_width); + int phase_left_moving = (int)(phase_left_stop + (*width - max_width)); int phase_right_stop = phase_left_moving + 2; int left_offset = phase - phase_left_stop; - int right_offset = (*width - max_width) - (phase - phase_right_stop); + int right_offset = (int)((*width - max_width) - (phase - phase_right_stop)); if (phase < phase_left_stop) *offset = 0; diff --git a/menu/menu_display.c b/menu/menu_display.c index a7e1a21e1250..7a0270253933 100644 --- a/menu/menu_display.c +++ b/menu/menu_display.c @@ -517,7 +517,7 @@ void menu_display_draw_bg(menu_display_ctx_draw_t *draw, if (!new_tex_coord) new_tex_coord = menu_disp->get_default_tex_coords(); - coords.vertices = draw->vertex_count; + coords.vertices = (unsigned)draw->vertex_count; coords.vertex = new_vertex; coords.tex_coord = new_tex_coord; coords.lut_tex_coord = new_tex_coord; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index f5c886044bf4..29d20e35daf9 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -5608,7 +5608,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) case DISPLAYLIST_CORE_CONTENT: #ifdef HAVE_NETWORKING print_buf_lines(info->list, core_buf, "", - core_len, FILE_TYPE_DOWNLOAD_CORE_CONTENT, true, false); + (int)core_len, FILE_TYPE_DOWNLOAD_CORE_CONTENT, true, false); info->need_push = true; info->need_refresh = true; #endif @@ -5626,7 +5626,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) if (str_list->elems[1].data) strlcpy(core_buf, str_list->elems[1].data, core_len); print_buf_lines(info->list, core_buf, new_label, - core_len, FILE_TYPE_DOWNLOAD_URL, false, false); + (int)core_len, FILE_TYPE_DOWNLOAD_URL, false, false); info->need_push = true; info->need_refresh = true; info->need_clear = true; @@ -5646,7 +5646,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) settings->network.buildbot_assets_url, "cores", sizeof(new_label)); print_buf_lines(info->list, core_buf, new_label, - core_len, FILE_TYPE_DOWNLOAD_URL, true, false); + (int)core_len, FILE_TYPE_DOWNLOAD_URL, true, false); info->need_push = true; info->need_refresh = true; #endif @@ -5655,7 +5655,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) case DISPLAYLIST_CORES_UPDATER: #ifdef HAVE_NETWORKING print_buf_lines(info->list, core_buf, "", - core_len, FILE_TYPE_DOWNLOAD_CORE, true, true); + (int)core_len, FILE_TYPE_DOWNLOAD_CORE, true, true); info->need_push = true; info->need_refresh = true; info->need_clear = true; @@ -5664,7 +5664,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) case DISPLAYLIST_THUMBNAILS_UPDATER: #ifdef HAVE_NETWORKING print_buf_lines(info->list, core_buf, "", - core_len, FILE_TYPE_DOWNLOAD_THUMBNAIL_CONTENT, + (int)core_len, FILE_TYPE_DOWNLOAD_THUMBNAIL_CONTENT, true, false); info->need_push = true; info->need_refresh = true; @@ -5674,7 +5674,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) case DISPLAYLIST_LAKKA: #ifdef HAVE_NETWORKING print_buf_lines(info->list, core_buf, "", - core_len, FILE_TYPE_DOWNLOAD_LAKKA, + (int)core_len, FILE_TYPE_DOWNLOAD_LAKKA, true, false); info->need_push = true; info->need_refresh = true; @@ -6166,7 +6166,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) menu_entries_append_enum(info->list, core_option_manager_get_desc(coreopts, i), "", MENU_ENUM_LABEL_CORE_OPTION_ENTRY, - MENU_SETTINGS_CORE_OPTION_START + i, 0, 0); + (unsigned)(MENU_SETTINGS_CORE_OPTION_START + i), 0, 0); } } else diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 36c7bc58eb94..c24311d4bcc5 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -433,7 +433,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data) driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv); - i = drv.len; + i = (int)drv.len; if (i >= 0) menu_driver_ctx = (const menu_ctx_driver_t*) @@ -681,7 +681,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data) return false; } list->entry = menu_driver_ctx->list_get_entry(menu_userdata, - list->type, list->idx); + list->type, (unsigned int)list->idx); } break; case RARCH_MENU_CTL_LIST_GET_SIZE: @@ -923,7 +923,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data) if (!menu_driver_ctx || !menu_driver_ctx->update_thumbnail_path) return false; - menu_driver_ctx->update_thumbnail_path(menu_userdata, selection); + menu_driver_ctx->update_thumbnail_path(menu_userdata, (unsigned)selection); } break; case RARCH_MENU_CTL_UPDATE_THUMBNAIL_IMAGE: @@ -941,7 +941,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data) if (!menu_driver_ctx || !menu_driver_ctx->update_savestate_thumbnail_path) return false; - menu_driver_ctx->update_savestate_thumbnail_path(menu_userdata, selection); + menu_driver_ctx->update_savestate_thumbnail_path(menu_userdata, (unsigned)selection); } break; case RARCH_MENU_CTL_UPDATE_SAVESTATE_THUMBNAIL_IMAGE: diff --git a/menu/menu_entries.c b/menu/menu_entries.c index 2f052e9b7fe9..cbcb582f5a38 100644 --- a/menu/menu_entries.c +++ b/menu/menu_entries.c @@ -153,8 +153,8 @@ static void menu_entries_build_scroll_indices(file_list_t *list) for (i = 1; i < list->size; i++) { - int first = menu_entries_elem_get_first_char(list, i); - bool is_dir = menu_entries_elem_is_dir(list, i); + int first = menu_entries_elem_get_first_char(list, (unsigned)i); + bool is_dir = menu_entries_elem_is_dir(list, (unsigned)i); if ((current_is_dir && !is_dir) || (first > current)) menu_navigation_ctl(MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX, &i); @@ -233,12 +233,12 @@ void menu_entries_get(size_t i, void *entry_data) if (cbs && cbs->action_get_value) cbs->action_get_value(selection_buf, - &entry->spacing, entry->type, i, label, + &entry->spacing, entry->type, (unsigned)i, label, entry->value, sizeof(entry->value), entry_label, path, entry->path, sizeof(entry->path)); - entry->idx = i; + entry->idx = (unsigned)i; if (entry_label) strlcpy(entry->label, entry_label, sizeof(entry->label)); @@ -316,7 +316,7 @@ file_list_t *menu_entries_get_selection_buf_ptr(size_t idx) menu_entries_ctl(MENU_ENTRIES_CTL_LIST_GET, &menu_list); if (!menu_list) return NULL; - return menu_list_get_selection(menu_list, idx); + return menu_list_get_selection(menu_list, (unsigned)idx); } static bool menu_entries_init(void) diff --git a/menu/menu_event.c b/menu/menu_event.c index 89d8149ffb4f..dc2b93121c3e 100644 --- a/menu/menu_event.c +++ b/menu/menu_event.c @@ -127,7 +127,7 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input) RETRO_DEVICE_ID_JOYPAD_B : RETRO_DEVICE_ID_JOYPAD_A; unsigned menu_cancel_btn = settings->input.menu_swap_ok_cancel_buttons ? RETRO_DEVICE_ID_JOYPAD_A : RETRO_DEVICE_ID_JOYPAD_B; - unsigned ok_current = input & UINT64_C(1) << menu_ok_btn; + unsigned ok_current = (unsigned)(input & UINT64_C(1) << menu_ok_btn); unsigned ok_trigger = ok_current & ~ok_old; ok_old = ok_current; diff --git a/menu/menu_input.c b/menu/menu_input.c index f771cf9afb69..0cffbe330c40 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -282,7 +282,7 @@ static int menu_input_mouse_frame( { size_t selection; menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection); - menu_entry_action(entry, selection, MENU_ACTION_CANCEL); + menu_entry_action(entry, (unsigned)selection, MENU_ACTION_CANCEL); } if (BIT64_GET(mouse_state, MENU_MOUSE_ACTION_WHEEL_DOWN)) @@ -519,7 +519,7 @@ static int menu_input_pointer_post_iterate( size_t selection; pointer_oldback = true; menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection); - menu_entry_action(entry, selection, MENU_ACTION_CANCEL); + menu_entry_action(entry, (unsigned)selection, MENU_ACTION_CANCEL); } } diff --git a/menu/menu_navigation.c b/menu/menu_navigation.c index 9d04848516b8..1020518e2e05 100644 --- a/menu/menu_navigation.c +++ b/menu/menu_navigation.c @@ -232,7 +232,7 @@ bool menu_navigation_ctl(enum menu_navigation_ctl_state state, void *data) size_t *sel = (size_t*)data; if (!sel) return false; - scroll_acceleration = *sel; + scroll_acceleration = (unsigned)(*sel); } break; case MENU_NAVIGATION_CTL_NONE: diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 3df51e103a6b..206339be195d 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -303,7 +303,7 @@ static int setting_string_action_left_audio_device(void *data, bool wraparound) /* Reset index if needed */ if (audio_device_index < 0) - audio_device_index = ptr->size - 1; + audio_device_index = (int)(ptr->size - 1); strlcpy(setting->value.target.string, ptr->elems[audio_device_index].data, setting->size); @@ -2210,7 +2210,7 @@ static bool setting_append_list( &group_info, &subgroup_info, parent_group); - (*list)[list_info->index - 1].size = path_get_realsize(RARCH_PATH_CORE); + (*list)[list_info->index - 1].size = (uint32_t)path_get_realsize(RARCH_PATH_CORE); (*list)[list_info->index - 1].value.target.string = path_get_ptr(RARCH_PATH_CORE); (*list)[list_info->index - 1].values = ext_name; menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_LOAD_CORE); @@ -6584,7 +6584,7 @@ bool menu_setting_free(void *data) /* Free data which was previously tagged */ for (; setting_get_type(setting) != ST_NONE; (*list = *list + 1)) - for (values = setting->free_flags, n = 0; values != 0; values >>= 1, n++) + for (values = (unsigned)setting->free_flags, n = 0; values != 0; values >>= 1, n++) if (values & 1) switch (1 << n) { diff --git a/menu/widgets/menu_entry.c b/menu/widgets/menu_entry.c index aa0116ba8fb2..beb59410903e 100644 --- a/menu/widgets/menu_entry.c +++ b/menu/widgets/menu_entry.c @@ -417,27 +417,27 @@ void menu_entry_get(menu_entry_t *entry, size_t stack_idx, if (cbs->action_get_value && use_representation) cbs->action_get_value(list, - &entry->spacing, entry->type, i, label, + &entry->spacing, entry->type, (unsigned)i, label, entry->value, sizeof(entry->value), entry_label, path, entry->path, sizeof(entry->path)); if (cbs->action_label) cbs->action_label(list, - entry->type, i, + entry->type, (unsigned)i, label, path, entry->rich_label, sizeof(entry->rich_label)); if (cbs->action_sublabel) cbs->action_sublabel(list, - entry->type, i, + entry->type, (unsigned)i, label, path, entry->sublabel, sizeof(entry->sublabel)); } - entry->idx = i; + entry->idx = (unsigned)i; if (path && !use_representation) strlcpy(entry->path, path, sizeof(entry->path)); diff --git a/menu/widgets/menu_list.c b/menu/widgets/menu_list.c index 7d7c37c9965c..421ecdd000f1 100644 --- a/menu/widgets/menu_list.c +++ b/menu/widgets/menu_list.c @@ -146,7 +146,7 @@ void menu_list_flush_stack(menu_list_t *list, const char *label = NULL; unsigned type = 0; size_t entry_idx = 0; - file_list_t *menu_list = menu_list_get(list, idx); + file_list_t *menu_list = menu_list_get(list, (unsigned)idx); if (!list) return; @@ -168,7 +168,7 @@ void menu_list_flush_stack(menu_list_t *list, menu_navigation_ctl(MENU_NAVIGATION_CTL_SET_SELECTION, &new_selection_ptr); - menu_list = menu_list_get(list, idx); + menu_list = menu_list_get(list, (unsigned)idx); menu_entries_get_last(menu_list, &path, &label, &type, &entry_idx); @@ -185,7 +185,7 @@ bool menu_list_pop_stack(menu_list_t *list, { menu_ctx_list_t list_info; bool refresh = false; - file_list_t *menu_list = menu_list_get(list, idx); + file_list_t *menu_list = menu_list_get(list, (unsigned)idx); if (!list) return false; diff --git a/movie.c b/movie.c index 95f3bc3c4cc9..b35b9b18ff72 100644 --- a/movie.c +++ b/movie.c @@ -170,7 +170,7 @@ static bool bsv_movie_init_record(bsv_movie_t *handle, const char *path) core_serialize_size(&info); - state_size = info.size; + state_size = (unsigned)info.size; header[STATE_SIZE_INDEX] = swap_if_big32(state_size); diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c index 02b95f21eec5..2c3bf332d418 100644 --- a/network/netplay/netplay_frontend.c +++ b/network/netplay/netplay_frontend.c @@ -126,16 +126,16 @@ static bool get_self_input_state(netplay_t *netplay) for (i = 0; i < RARCH_FIRST_CUSTOM_BIND; i++) { int16_t tmp = cb(0, - RETRO_DEVICE_JOYPAD, 0, i); + RETRO_DEVICE_JOYPAD, 0, (unsigned)i); state[0] |= tmp ? 1 << i : 0; } for (i = 0; i < 2; i++) { int16_t tmp_x = cb(0, - RETRO_DEVICE_ANALOG, i, 0); + RETRO_DEVICE_ANALOG, (unsigned)i, 0); int16_t tmp_y = cb(0, - RETRO_DEVICE_ANALOG, i, 1); + RETRO_DEVICE_ANALOG, (unsigned)i, 1); state[1 + i] = (uint16_t)tmp_x | (((uint16_t)tmp_y) << 16); } } @@ -803,9 +803,9 @@ void netplay_send_savestate(netplay_t *netplay, /* Compress it */ z->compression_backend->set_in(z->compression_stream, - (const uint8_t*)serial_info->data_const, serial_info->size); + (const uint8_t*)serial_info->data_const, (uint32_t)serial_info->size); z->compression_backend->set_out(z->compression_stream, - netplay->zbuffer, netplay->zbuffer_size); + netplay->zbuffer, (uint32_t)netplay->zbuffer_size); if (!z->compression_backend->trans(z->compression_stream, true, &rd, &wn, NULL)) { diff --git a/network/netplay/netplay_handshake.c b/network/netplay/netplay_handshake.c index 6350770520ae..2adf2d20ed60 100644 --- a/network/netplay/netplay_handshake.c +++ b/network/netplay/netplay_handshake.c @@ -440,7 +440,7 @@ static void netplay_handshake_ready(netplay_t *netplay, struct netplay_connectio if (netplay->is_server) { - netplay_log_connection(&connection->addr, connection - netplay->connections, connection->nick); + netplay_log_connection(&connection->addr, (unsigned)(connection - netplay->connections), connection->nick); /* Send them the savestate */ if (!(netplay->quirks & (NETPLAY_QUIRK_NO_SAVESTATES|NETPLAY_QUIRK_NO_TRANSMISSION))) @@ -956,7 +956,7 @@ bool netplay_handshake_pre_sync(netplay_t *netplay, { RECV(&device, sizeof(device)) return false; - pad.port = i; + pad.port = (unsigned)i; pad.device = ntohl(device); core_set_controller_port_device(&pad); } @@ -978,7 +978,7 @@ bool netplay_handshake_pre_sync(netplay_t *netplay, mem_info.id = RETRO_MEMORY_SAVE_RAM; core_get_memory(&mem_info); - local_sram_size = mem_info.size; + local_sram_size = (unsigned)mem_info.size; remote_sram_size = ntohl(cmd[1]) - 3*sizeof(uint32_t) - MAX_USERS*sizeof(uint32_t) - NETPLAY_NICK_LEN; diff --git a/network/netplay/netplay_io.c b/network/netplay/netplay_io.c index 20090e7b9aaf..390ab535a134 100644 --- a/network/netplay/netplay_io.c +++ b/network/netplay/netplay_io.c @@ -1138,7 +1138,7 @@ static bool netplay_get_cmd(netplay_t *netplay, netplay->zbuffer, cmd_size - 2*sizeof(uint32_t)); ctrans->decompression_backend->set_out(ctrans->decompression_stream, (uint8_t*)netplay->buffer[netplay->read_ptr[connection->player]].state, - netplay->state_size); + (unsigned)netplay->state_size); ctrans->decompression_backend->trans(ctrans->decompression_stream, true, &rd, &wn, NULL); diff --git a/paths.c b/paths.c index 736997df43ae..71e3d50b1cb3 100644 --- a/paths.c +++ b/paths.c @@ -320,7 +320,7 @@ static bool path_init_subsystem(void) { unsigned num_content = MIN(info->num_roms, path_is_empty(RARCH_PATH_SUBSYSTEM) ? - 0 : subsystem_fullpaths->size); + 0 : (unsigned)subsystem_fullpaths->size); for (i = 0; i < num_content; i++) { diff --git a/performance_counters.c b/performance_counters.c index 48eb3b67bcc8..26b70df87872 100644 --- a/performance_counters.c +++ b/performance_counters.c @@ -132,7 +132,7 @@ int rarch_timer_get_timeout(rarch_timer_t *timer) { if (!timer) return 0; - return timer->timeout; + return (int)timer->timeout; } bool rarch_timer_is_running(rarch_timer_t *timer) diff --git a/pkg/apple/RetroArch_iOS10_static.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS10_static.xcodeproj/project.pbxproj index fd68154248bb..2da428de20bf 100644 --- a/pkg/apple/RetroArch_iOS10_static.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS10_static.xcodeproj/project.pbxproj @@ -57,6 +57,10 @@ 5040F0511AE47EE2006F6972 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5040F04F1AE47ED4006F6972 /* libz.dylib */; }; 5041BAF41A9D40D000A77A33 /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 963C3C33186E3DED00A6EB1E /* GameController.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 50521A441AA23BF500185CC9 /* griffin_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 50521A431AA23BF500185CC9 /* griffin_objc.m */; }; + 50A8BDD11E62825700A5E607 /* assets.zip in Resources */ = {isa = PBXBuildFile; fileRef = 50A8BDD01E62825700A5E607 /* assets.zip */; }; + 50A8BDD21E62825700A5E607 /* assets.zip in Resources */ = {isa = PBXBuildFile; fileRef = 50A8BDD01E62825700A5E607 /* assets.zip */; }; + 50A8BDD31E62825700A5E607 /* assets.zip in Resources */ = {isa = PBXBuildFile; fileRef = 50A8BDD01E62825700A5E607 /* assets.zip */; }; + 50A8BDD41E62825700A5E607 /* assets.zip in Resources */ = {isa = PBXBuildFile; fileRef = 50A8BDD01E62825700A5E607 /* assets.zip */; }; 50C3B1AE1AB1107200F478D3 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50C3B1AD1AB1107100F478D3 /* QuartzCore.framework */; }; 50CCC828185E0E7D001F5BC8 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50CCC827185E0E7D001F5BC8 /* CoreLocation.framework */; }; 50E7189F184B88AA001956CE /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50E7189E184B88AA001956CE /* CoreVideo.framework */; }; @@ -108,6 +112,7 @@ 5039F36B1E623BBC00A48978 /* libretro_ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libretro_ios.a; sourceTree = ""; }; 5040F04F1AE47ED4006F6972 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 50521A431AA23BF500185CC9 /* griffin_objc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = griffin_objc.m; path = ../../griffin/griffin_objc.m; sourceTree = SOURCE_ROOT; }; + 50A8BDD01E62825700A5E607 /* assets.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; name = assets.zip; path = ../../../media/assets.zip; sourceTree = ""; }; 50C3B1AD1AB1107100F478D3 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 50CCC827185E0E7D001F5BC8 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; 50E7189E184B88AA001956CE /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; }; @@ -227,6 +232,7 @@ 83D632D719ECFCC4009E3161 /* Assets */ = { isa = PBXGroup; children = ( + 50A8BDD01E62825700A5E607 /* assets.zip */, 83EB675F19EEAF050096F441 /* iOS/modules */, 83D632DB19ECFCC4009E3161 /* iOS/Resources/ic_pause.png */, 83D632DE19ECFCC4009E3161 /* iOS/Resources/PauseIndicatorView.xib */, @@ -450,6 +456,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 50A8BDD31E62825700A5E607 /* assets.zip in Resources */, 0FDA2A881BE1AFA800F2B5DA /* iOS/Resources/ic_pause.png in Resources */, 0FDA2A891BE1AFA800F2B5DA /* InfoPlist.strings in Resources */, 0FDA2A8A1BE1AFA800F2B5DA /* iOS/Resources/Media.xcassets in Resources */, @@ -462,6 +469,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 50A8BDD21E62825700A5E607 /* assets.zip in Resources */, 5037009F1ACA18E400A51A37 /* iOS/Resources/ic_pause.png in Resources */, 503700A01ACA18E400A51A37 /* InfoPlist.strings in Resources */, 503700A11ACA18E400A51A37 /* iOS/Resources/Media.xcassets in Resources */, @@ -474,6 +482,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 50A8BDD41E62825700A5E607 /* assets.zip in Resources */, 9204BE221D319EF300BD49DB /* iOS/Resources/ic_pause.png in Resources */, 9204BE231D319EF300BD49DB /* InfoPlist.strings in Resources */, 9204BE241D319EF300BD49DB /* iOS/Resources/Media.xcassets in Resources */, @@ -486,6 +495,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 50A8BDD11E62825700A5E607 /* assets.zip in Resources */, 83D632E219ECFCC4009E3161 /* iOS/Resources/ic_pause.png in Resources */, 967894631788EBD800D6CA69 /* InfoPlist.strings in Resources */, 69D31DE41A547EC800EF4C92 /* iOS/Resources/Media.xcassets in Resources */, diff --git a/record/record_driver.c b/record/record_driver.c index a46954767aca..ef8e6630c801 100644 --- a/record/record_driver.c +++ b/record/record_driver.c @@ -107,7 +107,7 @@ void find_record_driver(void) driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv); - i = drv.len; + i = (int)drv.len; if (i >= 0) recording_driver = (const record_driver_t*)record_driver_find_handle(i); @@ -193,7 +193,7 @@ void recording_dump_frame(const void *data, unsigned width, video_driver_get_record_status(&has_gpu_record, &gpu_buf); - ffemu_data.pitch = pitch; + ffemu_data.pitch = (int)pitch; ffemu_data.width = width; ffemu_data.height = height; ffemu_data.data = data; @@ -236,9 +236,9 @@ void recording_dump_frame(const void *data, unsigned width, if (!video_driver_read_viewport(gpu_buf, is_idle)) return; - ffemu_data.pitch = recording_gpu_width * 3; - ffemu_data.width = recording_gpu_width; - ffemu_data.height = recording_gpu_height; + ffemu_data.pitch = (int)(recording_gpu_width * 3); + ffemu_data.width = (unsigned)recording_gpu_width; + ffemu_data.height = (unsigned)recording_gpu_height; ffemu_data.data = gpu_buf + (ffemu_data.height - 1) * ffemu_data.pitch; ffemu_data.pitch = -ffemu_data.pitch; diff --git a/retroarch.c b/retroarch.c index 035b7209b0d0..755a1389777f 100644 --- a/retroarch.c +++ b/retroarch.c @@ -533,8 +533,8 @@ static void retroarch_parse_input(int argc, char *argv[]) if (list && list->size == 2) { - port = strtol(list->elems[0].data, NULL, 0); - id = strtoul(list->elems[1].data, NULL, 0); + port = (int)strtol(list->elems[0].data, NULL, 0); + id = (unsigned)strtoul(list->elems[1].data, NULL, 0); } string_list_free(list); @@ -556,7 +556,7 @@ static void retroarch_parse_input(int argc, char *argv[]) case 'A': { unsigned new_port; - port = strtol(optarg, NULL, 0); + port = (int)strtol(optarg, NULL, 0); if (port < 1 || port > MAX_USERS) { RARCH_ERR("Connect dualanalog to a valid port.\n"); @@ -598,7 +598,7 @@ static void retroarch_parse_input(int argc, char *argv[]) case 'N': { unsigned new_port; - port = strtol(optarg, NULL, 0); + port = (int)strtol(optarg, NULL, 0); if (port < 1 || port > MAX_USERS) { RARCH_ERR("%s\n", @@ -728,7 +728,7 @@ static void retroarch_parse_input(int argc, char *argv[]) settings_t *settings = config_get_ptr(); retroarch_override_setting_set( RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES, NULL); - settings->netplay.check_frames = strtoul(optarg, NULL, 0); + settings->netplay.check_frames = (int)strtoul(optarg, NULL, 0); } break; @@ -737,7 +737,7 @@ static void retroarch_parse_input(int argc, char *argv[]) settings_t *settings = config_get_ptr(); retroarch_override_setting_set( RARCH_OVERRIDE_SETTING_NETPLAY_IP_PORT, NULL); - settings->netplay.port = strtoul(optarg, NULL, 0); + settings->netplay.port = (unsigned)strtoul(optarg, NULL, 0); } break; @@ -818,7 +818,7 @@ static void retroarch_parse_input(int argc, char *argv[]) case RA_OPT_MAX_FRAMES: { - unsigned max_frames = strtoul(optarg, NULL, 10); + unsigned max_frames = (unsigned)strtoul(optarg, NULL, 10); runloop_ctl(RUNLOOP_CTL_SET_MAX_FRAMES, &max_frames); } break; diff --git a/runloop.c b/runloop.c index 5d4cd2a4a59f..42c071c53943 100644 --- a/runloop.c +++ b/runloop.c @@ -252,7 +252,7 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data) unsigned *idx = (unsigned*)data; if (!idx) return false; - *idx = core_option_manager_size(runloop_core_options); + *idx = (unsigned)core_option_manager_size(runloop_core_options); } break; case RUNLOOP_CTL_HAS_CORE_OPTIONS: diff --git a/setting_list.c b/setting_list.c index 9cb30d5a7e8e..aaad464ebd6c 100644 --- a/setting_list.c +++ b/setting_list.c @@ -1682,7 +1682,7 @@ bool CONFIG_PATH( rarch_setting_t value = setting_string_setting(ST_PATH, msg_hash_to_str(name_enum_idx), msg_hash_to_str(SHORT_enum_idx), - target, len, default_value, "", + target, (unsigned)len, default_value, "", group_info->name, subgroup_info->name, parent_group, change_handler, read_handler, false); @@ -1715,7 +1715,7 @@ bool CONFIG_DIR( rarch_setting_t value = setting_string_setting(ST_DIR, msg_hash_to_str(name_enum_idx), msg_hash_to_str(SHORT_enum_idx), - target, len, default_value, + target, (unsigned)len, default_value, msg_hash_to_str(empty_enum_idx), group_info->name, subgroup_info->name, parent_group, change_handler, read_handler, @@ -1752,7 +1752,7 @@ bool CONFIG_STRING( rarch_setting_t value = setting_string_setting(ST_STRING, msg_hash_to_str(name_enum_idx), msg_hash_to_str(SHORT_enum_idx), - target, len, default_value, "", + target, (unsigned)len, default_value, "", group_info->name, subgroup_info->name, parent_group, change_handler, read_handler, false); if (!(settings_list_append(list, list_info))) @@ -1782,7 +1782,7 @@ bool CONFIG_STRING_OPTIONS( rarch_setting_t value = setting_string_setting_options(ST_STRING_OPTIONS, msg_hash_to_str(name_enum_idx), msg_hash_to_str(SHORT_enum_idx), - target, len, default_value, "", values, + target, (unsigned)len, default_value, "", values, group_info->name, subgroup_info->name, parent_group, change_handler, read_handler, false); if (!(settings_list_append(list, list_info))) @@ -2046,7 +2046,7 @@ static void menu_input_st_hex_cb(void *userdata, const char *str) if (str[0] == '#') str++; if (ptr) - *ptr = strtoul(str, NULL, 16); + *ptr = (unsigned)strtoul(str, NULL, 16); } } diff --git a/tasks/task_autodetect.c b/tasks/task_autodetect.c index cbbb43d5b836..53b55a52c25b 100644 --- a/tasks/task_autodetect.c +++ b/tasks/task_autodetect.c @@ -239,7 +239,7 @@ static bool input_autoconfigure_joypad_from_conf_dir( if(ret >= current_best) { - index = i; + index = (int)i; current_best = ret; } config_file_free(conf); diff --git a/tasks/task_database_cue.c b/tasks/task_database_cue.c index 458dde2a40a9..1fdd3965ac96 100644 --- a/tasks/task_database_cue.c +++ b/tasks/task_database_cue.c @@ -69,7 +69,7 @@ static ssize_t get_token(RFILE *fd, char *token, size_t max_len) while (1) { - int rv = filestream_read(fd, c, 1); + int rv = (int)filestream_read(fd, c, 1); if (rv == 0) return 0; @@ -123,7 +123,7 @@ static ssize_t get_token(RFILE *fd, char *token, size_t max_len) static int find_token(RFILE *fd, const char *token) { - int tmp_len = strlen(token); + int tmp_len = (int)strlen(token); char *tmp_token = (char*)calloc(tmp_len+1, 1); if (!tmp_token) diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c index a24208b37da5..8e466d545525 100644 --- a/tasks/task_overlay.c +++ b/tasks/task_overlay.c @@ -354,7 +354,7 @@ static bool task_overlay_resolve_targets(struct overlay *ol, else next_idx = (idx + 1) & size; - current->descs[i].next_index = next_idx; + current->descs[i].next_index = (unsigned)next_idx; } return true; @@ -427,7 +427,7 @@ static void task_overlay_deferred_loading(retro_task_t *task) { task_overlay_load_desc_image(loader, &overlay->descs[overlay->pos], overlay, - loader->pos, overlay->pos); + loader->pos, (unsigned)overlay->pos); } else { @@ -445,7 +445,7 @@ static void task_overlay_deferred_loading(retro_task_t *task) { if (!task_overlay_load_desc(loader, &overlay->descs[overlay->pos], overlay, - loader->pos, overlay->pos, + loader->pos, (unsigned)overlay->pos, overlay->image.width, overlay->image.height, overlay->config.normalized, overlay->config.alpha_mod, overlay->config.range_mod)) diff --git a/tasks/task_patch.c b/tasks/task_patch.c index 57fd190e5ac2..869d5eee6995 100644 --- a/tasks/task_patch.c +++ b/tasks/task_patch.c @@ -181,7 +181,7 @@ static enum patch_error bps_apply_patch( case SOURCE_COPY: case TARGET_COPY: { - int offset = bps_decode(&bps); + int offset = (int)bps_decode(&bps); bool negative = offset & 1; offset >>= 1; @@ -305,9 +305,9 @@ static enum patch_error ups_apply_patch( data.patch_data = patchdata; data.source_data = sourcedata; data.target_data = targetdata; - data.patch_length = patchlength; - data.source_length = sourcelength; - data.target_length = *targetlength; + data.patch_length = (unsigned)patchlength; + data.source_length = (unsigned)sourcelength; + data.target_length = (unsigned)*targetlength; data.patch_checksum = ~0; data.source_checksum = ~0; data.target_checksum = ~0; @@ -323,8 +323,8 @@ static enum patch_error ups_apply_patch( if (ups_patch_read(&data) != '1') return PATCH_PATCH_INVALID; - source_read_length = ups_decode(&data); - target_read_length = ups_decode(&data); + source_read_length = (unsigned)ups_decode(&data); + target_read_length = (unsigned)ups_decode(&data); if (data.source_length != source_read_length && data.source_length != target_read_length) @@ -333,11 +333,11 @@ static enum patch_error ups_apply_patch( target_read_length : source_read_length); if (data.target_length < *targetlength) return PATCH_TARGET_TOO_SMALL; - data.target_length = *targetlength; + data.target_length = (unsigned)*targetlength; while (data.patch_offset < data.patch_length - 12) { - unsigned length = ups_decode(&data); + unsigned length = (unsigned)ups_decode(&data); while (length--) ups_target_write(&data, ups_source_read(&data)); while (true) diff --git a/tasks/task_save.c b/tasks/task_save.c index d213f84c8bf2..af8db56dc630 100644 --- a/tasks/task_save.c +++ b/tasks/task_save.c @@ -276,7 +276,7 @@ void autosave_init(void) return; autosave_state.list = list; - autosave_state.num = task_save_files->size; + autosave_state.num = (unsigned)task_save_files->size; for (i = 0; i < task_save_files->size; i++) { @@ -401,7 +401,7 @@ bool content_undo_load_state(void) if (blocks) { - num_blocks = task_save_files->size; + num_blocks = (unsigned)task_save_files->size; for (i = 0; i < num_blocks; i++) blocks[i].type = task_save_files->elems[i].attr.i; } @@ -558,7 +558,7 @@ static void task_save_handler(retro_task_t *task) } remaining = MIN(state->size - state->written, SAVE_STATE_CHUNK); - written = filestream_write(state->file, + written = (int)filestream_write(state->file, (uint8_t*)state->data + state->written, remaining); state->written += written; @@ -872,7 +872,7 @@ static void content_load_state_cb(void *task_data, if (blocks) { - num_blocks = task_save_files->size; + num_blocks = (unsigned)task_save_files->size; for (i = 0; i < num_blocks; i++) blocks[i].type = task_save_files->elems[i].attr.i; } diff --git a/tasks/task_screenshot.c b/tasks/task_screenshot.c index 6a3e465933a0..ae680ad6a7c2 100644 --- a/tasks/task_screenshot.c +++ b/tasks/task_screenshot.c @@ -327,7 +327,7 @@ static bool take_screenshot_raw(const char *name_base, void *userbuf, */ if (!screenshot_dump(name_base, (const uint8_t*)data + (height - 1) * pitch, - width, height, -pitch, false, userbuf, savestate, is_idle, is_paused)) + width, height, (int)(-pitch), false, userbuf, savestate, is_idle, is_paused)) return false; return true; diff --git a/ui/drivers/cocoa/cocoatouch_menu.m b/ui/drivers/cocoa/cocoatouch_menu.m index 63023698586b..07ae97502e7e 100644 --- a/ui/drivers/cocoa/cocoatouch_menu.m +++ b/ui/drivers/cocoa/cocoatouch_menu.m @@ -675,7 +675,7 @@ - (void)willReloadData menu_entries_ctl(MENU_ENTRIES_CTL_START_GET, &i); for (; i < end; i++) - [everything addObject:[self make_menu_item_for_entry: i]]; + [everything addObject:[self make_menu_item_for_entry: (uint32_t)i]]; self.sections = [NSMutableArray array]; [self.sections addObject:everything]; @@ -771,7 +771,7 @@ - (void)menuBack menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, & selection); menu_entry_get(&entry, 0, selection, NULL, false); - menu_entry_action(&entry, selection, MENU_ACTION_CANCEL); + menu_entry_action(&entry, (unsigned int)selection, MENU_ACTION_CANCEL); #endif } diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m index 8b23e7fb17d1..33f4e967194e 100644 --- a/ui/drivers/ui_cocoatouch.m +++ b/ui/drivers/ui_cocoatouch.m @@ -110,9 +110,9 @@ void get_ios_version(int *major, int *minor) NSArray *decomposed_os_version = [[UIDevice currentDevice].systemVersion componentsSeparatedByString:@"."]; if (major && decomposed_os_version.count > 0) - *major = [decomposed_os_version[0] integerValue]; + *major = (int)[decomposed_os_version[0] integerValue]; if (minor && decomposed_os_version.count > 1) - *minor = [decomposed_os_version[1] integerValue]; + *minor = (int)[decomposed_os_version[1] integerValue]; } extern float cocoagl_gfx_ctx_get_native_scale(void); diff --git a/wifi/wifi_driver.c b/wifi/wifi_driver.c index f27a9ddf7e80..7963bd8073cf 100644 --- a/wifi/wifi_driver.c +++ b/wifi/wifi_driver.c @@ -149,7 +149,7 @@ bool wifi_driver_ctl(enum rarch_wifi_ctl_state state, void *data) driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv); - i = drv.len; + i = (int)drv.len; if (i >= 0) wifi_driver = (const wifi_driver_t*)wifi_driver_find_handle(i);