diff --git a/audio/drivers/alsa.c b/audio/drivers/alsa.c index c2f2a13f91..a1f5c722b3 100644 --- a/audio/drivers/alsa.c +++ b/audio/drivers/alsa.c @@ -370,7 +370,7 @@ static void *alsa_device_list_new(void *data) /* description of device IOID - input / output identifcation * ("Input" or "Output"), NULL means both) */ - if (!io || (string_is_equal_fast(io, "Output", 6))) + if (!io || (string_is_equal(io, "Output"))) string_list_append(s, name, attr); if (name) diff --git a/audio/drivers/alsathread.c b/audio/drivers/alsathread.c index b01b6a424a..109a4eb786 100644 --- a/audio/drivers/alsathread.c +++ b/audio/drivers/alsathread.c @@ -370,7 +370,7 @@ static void *alsa_device_list_new(void *data) /* description of device IOID - input / output identifcation * ("Input" or "Output"), NULL means both) */ - if (!io || (string_is_equal_fast(io,"Output", 6))) + if (!io || string_is_equal(io,"Output")) string_list_append(s, name, attr); if (name) diff --git a/configuration.c b/configuration.c index 6a70465a0c..a941032769 100644 --- a/configuration.c +++ b/configuration.c @@ -2238,15 +2238,15 @@ static bool check_shader_compatibility(enum file_path_enum enum_idx) { settings_t *settings = config_get_ptr(); - if (string_is_equal_fast(settings->arrays.video_driver, "vulkan", 6)) + if (string_is_equal(settings->arrays.video_driver, "vulkan")) { if (enum_idx != FILE_PATH_SLANGP_EXTENSION) return false; return true; } - if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2) || - string_is_equal_fast(settings->arrays.video_driver, "d3d", 3) + if (string_is_equal(settings->arrays.video_driver, "gl") || + string_is_equal(settings->arrays.video_driver, "d3d") ) { if (enum_idx == FILE_PATH_SLANGP_EXTENSION) @@ -2716,7 +2716,7 @@ static bool config_load_file(const char *path, bool set_defaults, if (!string_is_empty(settings->paths.directory_screenshot)) { - if (string_is_equal_fast(settings->paths.directory_screenshot, "default", 7)) + if (string_is_equal(settings->paths.directory_screenshot, "default")) *settings->paths.directory_screenshot = '\0'; else if (!path_is_directory(settings->paths.directory_screenshot)) { @@ -2741,36 +2741,35 @@ static bool config_load_file(const char *path, bool set_defaults, } #endif - if (string_is_equal_fast(settings->paths.path_menu_wallpaper, "default", 7)) + if (string_is_equal(settings->paths.path_menu_wallpaper, "default")) *settings->paths.path_menu_wallpaper = '\0'; - if (string_is_equal_fast(settings->paths.directory_video_shader, "default", 7)) + if (string_is_equal(settings->paths.directory_video_shader, "default")) *settings->paths.directory_video_shader = '\0'; - if (string_is_equal_fast(settings->paths.directory_video_filter, "default", 7)) + if (string_is_equal(settings->paths.directory_video_filter, "default")) *settings->paths.directory_video_filter = '\0'; - if (string_is_equal_fast(settings->paths.directory_audio_filter, "default", 7)) + if (string_is_equal(settings->paths.directory_audio_filter, "default")) *settings->paths.directory_audio_filter = '\0'; - if (string_is_equal_fast(settings->paths.directory_core_assets, "default", 7)) + if (string_is_equal(settings->paths.directory_core_assets, "default")) *settings->paths.directory_core_assets = '\0'; - if (string_is_equal_fast(settings->paths.directory_assets, "default", 7)) + if (string_is_equal(settings->paths.directory_assets, "default")) *settings->paths.directory_assets = '\0'; - if (string_is_equal_fast(settings->paths.directory_dynamic_wallpapers, "default", 7)) + if (string_is_equal(settings->paths.directory_dynamic_wallpapers, "default")) *settings->paths.directory_dynamic_wallpapers = '\0'; - if (string_is_equal_fast(settings->paths.directory_thumbnails, "default", 7)) + if (string_is_equal(settings->paths.directory_thumbnails, "default")) *settings->paths.directory_thumbnails = '\0'; - if (string_is_equal_fast(settings->paths.directory_playlist, "default", 7)) + if (string_is_equal(settings->paths.directory_playlist, "default")) *settings->paths.directory_playlist = '\0'; #ifdef HAVE_MENU - - if (string_is_equal_fast(settings->paths.directory_menu_content, "default", 7)) + if (string_is_equal(settings->paths.directory_menu_content, "default")) *settings->paths.directory_menu_content = '\0'; - if (string_is_equal_fast(settings->paths.directory_menu_config, "default", 7)) + if (string_is_equal(settings->paths.directory_menu_config, "default")) *settings->paths.directory_menu_config = '\0'; #endif #ifdef HAVE_OVERLAY - if (string_is_equal_fast(settings->paths.directory_overlay, "default", 7)) + if (string_is_equal(settings->paths.directory_overlay, "default")) *settings->paths.directory_overlay = '\0'; #endif - if (string_is_equal_fast(settings->paths.directory_system, "default", 7)) + if (string_is_equal(settings->paths.directory_system, "default")) *settings->paths.directory_system = '\0'; if (settings->floats.slowmotion_ratio < 1.0f) @@ -2791,7 +2790,7 @@ static bool config_load_file(const char *path, bool set_defaults, if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL) && config_get_path(conf, "savefile_directory", tmp_str, path_size)) { - if (string_is_equal_fast(tmp_str, "default", 7)) + if (string_is_equal(tmp_str, "default")) dir_set(RARCH_DIR_SAVEFILE, g_defaults.dirs[DEFAULT_DIR_SRAM]); else if (path_is_directory(tmp_str)) @@ -2817,7 +2816,7 @@ static bool config_load_file(const char *path, bool set_defaults, if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL) && config_get_path(conf, "savestate_directory", tmp_str, path_size)) { - if (string_is_equal_fast(tmp_str, "default", 7)) + if (string_is_equal(tmp_str, "default")) dir_set(RARCH_DIR_SAVESTATE, g_defaults.dirs[DEFAULT_DIR_SAVESTATE]); else if (path_is_directory(tmp_str)) { diff --git a/frontend/drivers/platform_unix.c b/frontend/drivers/platform_unix.c index 15d93a7554..e90d525ce9 100644 --- a/frontend/drivers/platform_unix.c +++ b/frontend/drivers/platform_unix.c @@ -974,7 +974,7 @@ static bool frontend_unix_powerstate_check_apm( if (!next_string(&ptr, &str)) /* remaining battery life time units */ goto error; - else if (string_is_equal_fast(str, "min", 3)) + else if (string_is_equal(str, "min")) battery_time *= 60; if (battery_flag == 0xFF) /* unknown state */ @@ -1337,7 +1337,7 @@ static void frontend_unix_get_env(int *argc, if (android_app->getStringExtra && jstr) { const char *argv = (*env)->GetStringUTFChars(env, jstr, 0); - bool used = string_is_equal_fast(argv, "false", 5) ? false : true; + bool used = string_is_equal(argv, "false") ? false : true; (*env)->ReleaseStringUTFChars(env, jstr, argv); diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c index 61f1471fcb..e43c0aa4b1 100644 --- a/gfx/common/win32_common.c +++ b/gfx/common/win32_common.c @@ -460,7 +460,7 @@ static LRESULT win32_handle_keyboard_event(HWND hwnd, UINT message, keydown = false; #if _WIN32_WINNT >= 0x0501 /* XP */ - if (string_is_equal_fast(config_get_ptr()->arrays.input_driver, "raw", 4)) + if (string_is_equal(config_get_ptr()->arrays.input_driver, "raw")) keycode = input_keymaps_translate_keysym_to_rk((unsigned)(wparam)); else #endif diff --git a/gfx/drivers/drm_gfx.c b/gfx/drivers/drm_gfx.c index 56972c5d1f..7366620b4c 100644 --- a/gfx/drivers/drm_gfx.c +++ b/gfx/drivers/drm_gfx.c @@ -405,19 +405,24 @@ static bool format_support(const drmModePlanePtr ovr, uint32_t fmt) static uint64_t drm_plane_type(drmModePlane *plane) { int i,j; - /* The property values and their names are stored in different arrays, so we - * access them simultaneously here. - * We are interested in OVERLAY planes only, that's type 0 or DRM_PLANE_TYPE_OVERLAY + + /* The property values and their names are stored in different arrays, + * so we access them simultaneously here. + * We are interested in OVERLAY planes only, that's + * type 0 or DRM_PLANE_TYPE_OVERLAY * (see /usr/xf86drmMode.h for definition). */ drmModeObjectPropertiesPtr props = - drmModeObjectGetProperties(drm.fd, plane->plane_id, DRM_MODE_OBJECT_PLANE); + drmModeObjectGetProperties(drm.fd, plane->plane_id, + DRM_MODE_OBJECT_PLANE); for (j = 0; j < props->count_props; j++) { /* found the type property */ - if (string_is_equal_fast(drmModeGetProperty(drm.fd, props->props[j])->name, "type", 4)) + if (string_is_equal( + drmModeGetProperty(drm.fd, props->props[j])->name, "type")) return (props->prop_values[j]); } + return (0); } diff --git a/gfx/drivers/exynos_gfx.c b/gfx/drivers/exynos_gfx.c index 8f4b9f58c5..02e5a43964 100644 --- a/gfx/drivers/exynos_gfx.c +++ b/gfx/drivers/exynos_gfx.c @@ -181,7 +181,7 @@ static int exynos_get_device_index(void) ver = drmGetVersion(fd); - if (string_is_equal_fast(ver->name, "exynos", 6)) + if (string_is_equal(ver->name, "exynos")) found = true; else ++index; diff --git a/gfx/drivers_context/d3d_ctx.c b/gfx/drivers_context/d3d_ctx.c index c45de9c4c8..2214093159 100644 --- a/gfx/drivers_context/d3d_ctx.c +++ b/gfx/drivers_context/d3d_ctx.c @@ -213,7 +213,7 @@ static void gfx_ctx_d3d_input_driver(void *data, #if _WIN32_WINNT >= 0x0501 /* winraw only available since XP */ - if (string_is_equal_fast(settings->arrays.input_driver, "raw", 4)) + if (string_is_equal(settings->arrays.input_driver, "raw")) { *input_data = input_winraw.init(name); if (*input_data) diff --git a/gfx/drivers_context/gdi_ctx.c b/gfx/drivers_context/gdi_ctx.c index eee7296ad4..822087ac45 100644 --- a/gfx/drivers_context/gdi_ctx.c +++ b/gfx/drivers_context/gdi_ctx.c @@ -226,7 +226,7 @@ static void gfx_ctx_gdi_input_driver(void *data, #if _WIN32_WINNT >= 0x0501 /* winraw only available since XP */ - if (string_is_equal_fast(settings->arrays.input_driver, "raw", 4)) + if (string_is_equal(settings->arrays.input_driver, "raw")) { *input_data = input_winraw.init(joypad_name); if (*input_data) diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c index 780e25827b..7da01152eb 100644 --- a/gfx/drivers_context/wgl_ctx.c +++ b/gfx/drivers_context/wgl_ctx.c @@ -592,12 +592,12 @@ static void gfx_ctx_wgl_input_driver(void *data, #if _WIN32_WINNT >= 0x0501 /* winraw only available since XP */ - if (string_is_equal_fast(settings->arrays.input_driver, "raw", 4)) + if (string_is_equal(settings->arrays.input_driver, "raw")) { *input_data = input_winraw.init(joypad_name); if (*input_data) { - *input = &input_winraw; + *input = &input_winraw; dinput_wgl = NULL; return; } diff --git a/gfx/drivers_context/x_ctx.c b/gfx/drivers_context/x_ctx.c index ca228881ea..a5276d2ba7 100644 --- a/gfx/drivers_context/x_ctx.c +++ b/gfx/drivers_context/x_ctx.c @@ -965,7 +965,7 @@ static void gfx_ctx_x_input_driver(void *data, #ifdef HAVE_UDEV settings_t *settings = config_get_ptr(); - if (string_is_equal_fast(settings->arrays.input_driver, "udev", 5)) + if (string_is_equal(settings->arrays.input_driver, "udev")) { *input_data = input_udev.init(joypad_name); if (*input_data) diff --git a/gfx/drivers_renderchain/d3d9_cg_renderchain.c b/gfx/drivers_renderchain/d3d9_cg_renderchain.c index 2ea6c9c46f..d0911203f3 100644 --- a/gfx/drivers_renderchain/d3d9_cg_renderchain.c +++ b/gfx/drivers_renderchain/d3d9_cg_renderchain.c @@ -303,7 +303,7 @@ static bool d3d9_cg_renderchain_init_shader_fvf(void *data, void *pass_data) for (count = 0; count < MAXD3DDECLLENGTH; count++) { - if (string_is_equal_fast(&decl_end, &decl[count], sizeof(decl_end))) + if (string_is_equal(&decl_end, &decl[count])) break; } diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c index 34bb362d9c..8843164ddd 100644 --- a/gfx/drivers_shader/shader_gl_cg.c +++ b/gfx/drivers_shader/shader_gl_cg.c @@ -1110,7 +1110,7 @@ static void *gl_cg_init(void *data, const char *path) memset(cg->alias_define, 0, sizeof(cg->alias_define)); if ( !string_is_empty(path) - && string_is_equal_fast(path_get_extension(path), "cgp", 3)) + && string_is_equal(path_get_extension(path), "cgp")) { if (!gl_cg_load_preset(cg, path)) goto error; diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c index dc5b96528d..e9be2b930c 100644 --- a/gfx/drivers_shader/shader_glsl.c +++ b/gfx/drivers_shader/shader_glsl.c @@ -840,7 +840,7 @@ static void *gl_glsl_init(void *data, const char *path) bool ret = false; const char *path_ext = path_get_extension(path); - if (string_is_equal_fast(path_ext, "glslp", 5)) + if (string_is_equal(path_ext, "glslp")) { conf = config_file_new(path); if (conf) @@ -849,7 +849,7 @@ static void *gl_glsl_init(void *data, const char *path) glsl->shader->modern = true; } } - else if (string_is_equal_fast(path_ext, "glsl", 4)) + else if (string_is_equal(path_ext, "glsl")) { strlcpy(glsl->shader->pass[0].source.path, path, sizeof(glsl->shader->pass[0].source.path)); diff --git a/gfx/drivers_shader/shader_hlsl.c b/gfx/drivers_shader/shader_hlsl.c index 07c6541147..fa78db7c21 100644 --- a/gfx/drivers_shader/shader_hlsl.c +++ b/gfx/drivers_shader/shader_hlsl.c @@ -479,7 +479,7 @@ static void *hlsl_init(void *data, const char *path) if (!hlsl_data) return NULL; - if (path && (string_is_equal_fast(path_get_extension(path), ".cgp", 4))) + if (path && (string_is_equal(path_get_extension(path), ".cgp"))) { if (!hlsl_load_preset(hlsl_data, d3d, path)) goto error; diff --git a/gfx/video_shader_parse.c b/gfx/video_shader_parse.c index 371be6d070..d993b84a5f 100644 --- a/gfx/video_shader_parse.c +++ b/gfx/video_shader_parse.c @@ -537,7 +537,7 @@ bool video_shader_resolve_parameters(config_file_t *conf, /* First try to use the more robust slang implementation to support #includes. */ /* FIXME: The check for slang can be removed if it's sufficiently tested for * GLSL/Cg as well, it should be the same implementation. */ - if (string_is_equal_fast(path_get_extension(path), "slang", 5) && + if (string_is_equal(path_get_extension(path), "slang") && slang_preprocess_parse_parameters(shader->pass[i].source.path, shader)) { free(line); diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c index 5a1670909a..bcdacb60a6 100644 --- a/input/drivers/udev_input.c +++ b/input/drivers/udev_input.c @@ -615,18 +615,18 @@ static void udev_input_handle_hotplug(udev_input_t *udev) action = udev_device_get_action(dev); devnode = udev_device_get_devnode(dev); - if (val_key && string_is_equal_fast(val_key, "1", 1) && devnode) + if (val_key && string_is_equal(val_key, "1") && devnode) { /* EV_KEY device, can be a keyboard or a remote control device. */ dev_type = UDEV_INPUT_KEYBOARD; cb = udev_handle_keyboard; } - else if (val_mouse && string_is_equal_fast(val_mouse, "1", 1) && devnode) + else if (val_mouse && string_is_equal(val_mouse, "1") && devnode) { dev_type = UDEV_INPUT_MOUSE; cb = udev_handle_mouse; } - else if (val_touchpad && string_is_equal_fast(val_touchpad, "1", 1) && devnode) + else if (val_touchpad && string_is_equal(val_touchpad, "1") && devnode) { dev_type = UDEV_INPUT_TOUCHPAD; cb = udev_handle_mouse; @@ -634,13 +634,13 @@ static void udev_input_handle_hotplug(udev_input_t *udev) else goto end; - if (string_is_equal_fast(action, "add", 3)) + if (string_is_equal(action, "add")) { RARCH_LOG("[udev]: Hotplug add %s: %s.\n", g_dev_type_str[dev_type], devnode); udev_input_add_device(udev, dev_type, devnode, cb); } - else if (string_is_equal_fast(action, "remove", 6)) + else if (string_is_equal(action, "remove")) { RARCH_LOG("[udev]: Hotplug remove %s: %s.\n", g_dev_type_str[dev_type], devnode); diff --git a/input/drivers_joypad/udev_joypad.c b/input/drivers_joypad/udev_joypad.c index 03188ccff3..6f047224a3 100644 --- a/input/drivers_joypad/udev_joypad.c +++ b/input/drivers_joypad/udev_joypad.c @@ -449,14 +449,14 @@ static void udev_joypad_poll(void) const char *action = udev_device_get_action(dev); const char *devnode = udev_device_get_devnode(dev); - if (val && string_is_equal_fast(val, "1", 1) && devnode) + if (val && string_is_equal(val, "1") && devnode) { - if (string_is_equal_fast(action, "add", 3)) + if (string_is_equal(action, "add")) { RARCH_LOG("[udev]: Hotplug add: %s.\n", devnode); udev_check_device(dev, devnode); } - else if (string_is_equal_fast(action, "remove", 6)) + else if (string_is_equal(action, "remove")) { RARCH_LOG("[udev]: Hotplug remove: %s.\n", devnode); udev_joypad_remove_device(devnode); diff --git a/input/input_driver.c b/input/input_driver.c index 73ea18aefe..033933ad4a 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -2339,13 +2339,13 @@ static void parse_hat(struct retro_keybind *bind, const char *str) return; } - if (string_is_equal_fast(dir, "up", 2)) + if (string_is_equal(dir, "up")) hat_dir = HAT_UP_MASK; - else if (string_is_equal_fast(dir, "down", 4)) + else if (string_is_equal(dir, "down")) hat_dir = HAT_DOWN_MASK; - else if (string_is_equal_fast(dir, "left", 4)) + else if (string_is_equal(dir, "left")) hat_dir = HAT_LEFT_MASK; - else if (string_is_equal_fast(dir, "right", 5)) + else if (string_is_equal(dir, "right")) hat_dir = HAT_RIGHT_MASK; if (hat_dir) diff --git a/intl/msg_hash_chs.c b/intl/msg_hash_chs.c index d68d51b247..1c1cd4e428 100644 --- a/intl/msg_hash_chs.c +++ b/intl/msg_hash_chs.c @@ -757,7 +757,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "当前视频驱动."); - if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2)) + if (string_is_equal(settings->arrays.video_driver, "gl")) { snprintf(s, len, "OpenGL视频驱动. \n" @@ -771,7 +771,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) "dependent on your graphics card's \n" "underlying GL driver)."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl2")) { snprintf(s, len, "SDL 2 视频驱动.\n" @@ -783,7 +783,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) "core implementations is dependent \n" "on your platform SDL implementation."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl1")) { snprintf(s, len, "SDL 视频驱动.\n" @@ -794,7 +794,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) "Performance is considered to be suboptimal. \n" "Consider using it only as a last resort."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3)) + else if (string_is_equal(settings->arrays.video_driver, "d3d")) { snprintf(s, len, "Direct3D 视频驱动. \n" @@ -803,7 +803,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) "is dependent on your graphic card's \n" "underlying D3D driver)."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6)) + else if (string_is_equal(settings->arrays.video_driver, "exynos")) { snprintf(s, len, "Exynos-G2D 视频驱动. \n" @@ -815,7 +815,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) "Performance for software rendered cores \n" "should be optimal."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "drm", 3)) + else if (string_is_equal(settings->arrays.video_driver, "drm")) { snprintf(s, len, "Plain DRM 视频驱动. \n" @@ -824,7 +824,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) "libdrm for hardware scaling using \n" "GPU overlays."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5)) + else if (string_is_equal(settings->arrays.video_driver, "sunxi")) { snprintf(s, len, "Sunxi-G2D 视频驱动. \n" diff --git a/intl/msg_hash_cht.c b/intl/msg_hash_cht.c index a08736ee89..cac0a4a1c0 100644 --- a/intl/msg_hash_cht.c +++ b/intl/msg_hash_cht.c @@ -754,7 +754,7 @@ int menu_hash_get_help_cht_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "當前視訊驅動."); - if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2)) + if (string_is_equal(settings->arrays.video_driver, "gl")) { snprintf(s, len, "OpenGL視訊驅動. \n" @@ -768,7 +768,7 @@ int menu_hash_get_help_cht_enum(enum msg_hash_enums msg, char *s, size_t len) "dependent on your graphics card's \n" "underlying GL driver)."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl2")) { snprintf(s, len, "SDL 2 視訊驅動.\n" @@ -780,7 +780,7 @@ int menu_hash_get_help_cht_enum(enum msg_hash_enums msg, char *s, size_t len) "core implementations is dependent \n" "on your platform SDL implementation."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl1")) { snprintf(s, len, "SDL 視訊驅動.\n" @@ -791,7 +791,7 @@ int menu_hash_get_help_cht_enum(enum msg_hash_enums msg, char *s, size_t len) "Performance is considered to be suboptimal. \n" "Consider using it only as a last resort."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3)) + else if (string_is_equal(settings->arrays.video_driver, "d3d")) { snprintf(s, len, "Direct3D 視訊驅動. \n" @@ -800,7 +800,7 @@ int menu_hash_get_help_cht_enum(enum msg_hash_enums msg, char *s, size_t len) "is dependent on your graphic card's \n" "underlying D3D driver)."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6)) + else if (string_is_equal(settings->arrays.video_driver, "exynos")) { snprintf(s, len, "Exynos-G2D 視訊驅動. \n" @@ -812,7 +812,7 @@ int menu_hash_get_help_cht_enum(enum msg_hash_enums msg, char *s, size_t len) "Performance for software rendered cores \n" "should be optimal."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "drm", 3)) + else if (string_is_equal(settings->arrays.video_driver, "drm")) { snprintf(s, len, "Plain DRM 視訊驅動. \n" @@ -821,7 +821,7 @@ int menu_hash_get_help_cht_enum(enum msg_hash_enums msg, char *s, size_t len) "libdrm for hardware scaling using \n" "GPU overlays."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5)) + else if (string_is_equal(settings->arrays.video_driver, "sunxi")) { snprintf(s, len, "Sunxi-G2D 視訊驅動. \n" diff --git a/intl/msg_hash_de.c b/intl/msg_hash_de.c index 6f56a0dd5a..594db1189c 100644 --- a/intl/msg_hash_de.c +++ b/intl/msg_hash_de.c @@ -787,7 +787,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Aktueller Grafiktreiber"); - if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2)) + if (string_is_equal(settings->arrays.video_driver, "gl")) { snprintf(s, len, "OpenGL-Grafiktreiber. \n" @@ -800,7 +800,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) "als auch bei Libretro-GL-Cores, hängt von dem \n" "GL-Treiber deiner Grafikkarte ab."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl2")) { snprintf(s, len, "SDL2-Grafiktreiber.\n" @@ -811,7 +811,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) "Die Leistung hängt von der SDL- \n" "Implementierung deiner Plattform ab."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl1")) { snprintf(s, len, "SDL-Grafiktreiber.\n" @@ -823,7 +823,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) "solltest diesen Treiber nur als letzte \n" "Möglichkeit verwenden."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3)) + else if (string_is_equal(settings->arrays.video_driver, "d3d")) { snprintf(s, len, "Direct3D-Grafiktreiber. \n" @@ -832,7 +832,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) "Cores hängt von dem D3D-Treiber deiner \n" "Grafikkarte ab."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6)) + else if (string_is_equal(settings->arrays.video_driver, "exynos")) { snprintf(s, len, "Exynos-G2D-Grafiktreiber. \n" @@ -844,7 +844,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) "Die Leistung bei software-gerendeten Cores sollte \n" "optimal sein."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "drm", 3)) + else if (string_is_equal(settings->arrays.video_driver, "drm")) { snprintf(s, len, "DRM-Grafiktreiber \n" @@ -853,7 +853,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len) "Er verwendet libdrm für Hardware-Skalierung und \n" "GPU-Overlays."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5)) + else if (string_is_equal(settings->arrays.video_driver, "sunxi")) { snprintf(s, len, "Sunxi-G2D-Grafiktreiber\n" diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c index 0e17b15373..09e661401e 100644 --- a/intl/msg_hash_es.c +++ b/intl/msg_hash_es.c @@ -234,7 +234,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Controlador de vídeo actual."); - if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2)) + if (string_is_equal(settings->arrays.video_driver, "gl")) { snprintf(s, len, "Controlador de vídeo OpenGL. \n" @@ -249,7 +249,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) "del controlador GL que tenga tu \n" "tarjeta gráfica."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl2")) { snprintf(s, len, "Controlador de vídeo SDL 2.\n" @@ -261,7 +261,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) "libretro por software depende de la \n" "implementación SDL de tu plataforma."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl1")) { snprintf(s, len, "Controlador de vídeo SDL.\n" @@ -273,7 +273,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) "a lo óptimo. Utilízalo únicamente como \n" "último recurso."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3)) + else if (string_is_equal(settings->arrays.video_driver, "d3d")) { snprintf(s, len, "Controlador de vídeo Direct3D. \n" @@ -283,7 +283,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) "del controlador D3D de tu tarjeta \n" "gráfica."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6)) + else if (string_is_equal(settings->arrays.video_driver, "exynos")) { snprintf(s, len, "Controlador de vídeo Exynos-G2D. \n" @@ -297,7 +297,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) "renderizados por software debería \n" "ser óptimo."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "drm", 3)) + else if (string_is_equal(settings->arrays.video_driver, "drm")) { snprintf(s, len, "Controlador de vídeo de DRM simple. \n" @@ -308,7 +308,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) " \n" "El blitting se hace por software."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5)) + else if (string_is_equal(settings->arrays.video_driver, "sunxi")) { snprintf(s, len, "Controlador de vídeo Sunxi-G2D. \n" diff --git a/intl/msg_hash_it.c b/intl/msg_hash_it.c index fd996f0714..3c7855a1fe 100644 --- a/intl/msg_hash_it.c +++ b/intl/msg_hash_it.c @@ -209,7 +209,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Driver video attuale."); - if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2)) + if (string_is_equal(settings->arrays.video_driver, "gl")) { snprintf(s, len, "Diver video OpenGL. \n" @@ -223,7 +223,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len) "dalla tua scheda grafica \n" "sottostante driver GL)."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl2")) { snprintf(s, len, "Driver video SDL 2.\n" @@ -235,7 +235,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len) "renderizzati via software dipende \n" "dall'implementazzione sulla tua piattaforma SDL."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl1")) { snprintf(s, len, "Driver video SDL.\n" @@ -246,7 +246,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len) "Le performance sono considerate quasi ottimali. \n" "Considera di usare questo soltanto come ultima scelta."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3)) + else if (string_is_equal(settings->arrays.video_driver, "d3d")) { snprintf(s, len, "Driver video Direct3D. \n" @@ -255,7 +255,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len) "software dipende dal driver D3D inerente \n" "alla tua scheda video)."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6)) + else if (string_is_equal(settings->arrays.video_driver, "exynos")) { snprintf(s, len, "Exynos-G2D Video Driver. \n" @@ -267,7 +267,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len) "Le performance per i core renderizzati via software \n" "dovrebbero essere ottimali."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5)) + else if (string_is_equal(settings->arrays.video_driver, "sunxi")) { snprintf(s, len, "Driver video Sunxi-G2D. \n" diff --git a/intl/msg_hash_ja.c b/intl/msg_hash_ja.c index 54531b7640..c9b6f552b7 100644 --- a/intl/msg_hash_ja.c +++ b/intl/msg_hash_ja.c @@ -781,7 +781,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Current Video driver."); - if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2)) + if (string_is_equal(settings->arrays.video_driver, "gl")) { snprintf(s, len, "OpenGL Video driver. \n" @@ -795,7 +795,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) "dependent on your graphics card's \n" "underlying GL driver)."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl2")) { snprintf(s, len, "SDL 2 Video driver.\n" @@ -807,7 +807,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) "core implementations is dependent \n" "on your platform SDL implementation."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl1")) { snprintf(s, len, "SDL Video driver.\n" @@ -818,7 +818,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) "Performance is considered to be suboptimal. \n" "Consider using it only as a last resort."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3)) + else if (string_is_equal(settings->arrays.video_driver, "d3d")) { snprintf(s, len, "Direct3D Video driver. \n" @@ -827,7 +827,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) "is dependent on your graphic card's \n" "underlying D3D driver)."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6)) + else if (string_is_equal(settings->arrays.video_driver, "exynos")) { snprintf(s, len, "Exynos-G2D Video Driver. \n" @@ -839,7 +839,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) "Performance for software rendered cores \n" "should be optimal."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "drm", 3)) + else if (string_is_equal(settings->arrays.video_driver, "drm")) { snprintf(s, len, "Plain DRM Video Driver. \n" @@ -848,7 +848,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) "libdrm for hardware scaling using \n" "GPU overlays."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5)) + else if (string_is_equal(settings->arrays.video_driver, "sunxi")) { snprintf(s, len, "Sunxi-G2D Video Driver. \n" diff --git a/intl/msg_hash_ko.c b/intl/msg_hash_ko.c index 7d77c2d7bc..5ccf9a6c4b 100644 --- a/intl/msg_hash_ko.c +++ b/intl/msg_hash_ko.c @@ -770,7 +770,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { snprintf(s, len, "Current Video driver."); - if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2)) + if (string_is_equal(settings->arrays.video_driver, "gl")) { snprintf(s, len, "OpenGL Video driver. \n" @@ -784,7 +784,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { "dependent on your graphics card's \n" "underlying GL driver)."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl2")) { snprintf(s, len, "SDL 2 Video driver.\n" @@ -796,7 +796,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { "core implementations is dependent \n" "on your platform SDL implementation."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl1")) { snprintf(s, len, "SDL Video driver.\n" @@ -807,7 +807,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { "Performance is considered to be suboptimal. \n" "Consider using it only as a last resort."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3)) + else if (string_is_equal(settings->arrays.video_driver, "d3d")) { snprintf(s, len, "Direct3D Video driver. \n" @@ -816,7 +816,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { "is dependent on your graphic card's \n" "underlying D3D driver)."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6)) + else if (string_is_equal(settings->arrays.video_driver, "exynos")) { snprintf(s, len, "Exynos-G2D Video Driver. \n" @@ -827,7 +827,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { " \n" "Performance for software rendered cores \n" "should be optimal."); - } else if (string_is_equal_fast(settings->arrays.video_driver, "drm", 3)) + } else if (string_is_equal(settings->arrays.video_driver, "drm")) { snprintf(s, len, "Plain DRM Video Driver. \n" @@ -836,7 +836,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) { "libdrm for hardware scaling using \n" "GPU overlays."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5)) + else if (string_is_equal(settings->arrays.video_driver, "sunxi")) { snprintf(s, len, "Sunxi-G2D Video Driver. \n" diff --git a/intl/msg_hash_pt_br.c b/intl/msg_hash_pt_br.c index 3f60fba684..b2ddf5dcd0 100644 --- a/intl/msg_hash_pt_br.c +++ b/intl/msg_hash_pt_br.c @@ -823,7 +823,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Driver de vídeo atual."); - if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2)) + if (string_is_equal(settings->arrays.video_driver, "gl")) { snprintf(s, len, "Driver de vídeo OpenGL. \n" @@ -836,7 +836,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len) "Libretro GL ou renderizados por software \n" "é dependente do driver GL de sua placa de vídeo."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl2")) { snprintf(s, len, "Driver de vídeo SDL 2.\n" @@ -848,7 +848,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len) "libretro renderizados por software é dependente \n" "da implementação SDL da sua plataforma."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl1")) { snprintf(s, len, "Driver de vídeo SDL. \n" @@ -859,7 +859,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len) "O desempenho é considerado medíocre. \n" "Cosidere utilizar apenas como último recurso."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3)) + else if (string_is_equal(settings->arrays.video_driver, "d3d")) { snprintf(s, len, "Driver de vídeo Direct3D. \n" @@ -868,7 +868,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len) "software depende do driver D3D de base da\n" "sua placa de vídeo)."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6)) + else if (string_is_equal(settings->arrays.video_driver, "exynos")) { snprintf(s, len, "Driver de vídeo Exynos-G2D. \n" @@ -880,7 +880,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len) "O desempenho de núcleos renderizados por \n" "por hardware deve ser ótimo."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "drm", 3)) + else if (string_is_equal(settings->arrays.video_driver, "drm")) { snprintf(s, len, "Driver de vídeo Plain DRM. \n" @@ -889,7 +889,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len) "usando libdrm para escala por hardware \n" "utilizando overlay de GPU."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5)) + else if (string_is_equal(settings->arrays.video_driver, "sunxi")) { snprintf(s, len, "Driver de vídeo Sunxi-G2D. \n" diff --git a/intl/msg_hash_pt_pt.c b/intl/msg_hash_pt_pt.c index 3877ade922..69b5720b4f 100644 --- a/intl/msg_hash_pt_pt.c +++ b/intl/msg_hash_pt_pt.c @@ -108,7 +108,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Driver de Vídeo em uso."); - if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2)) + if (string_is_equal(settings->arrays.video_driver, "gl")) { snprintf(s, len, "Driver de Vídeo OpenGL. \n" @@ -122,7 +122,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len) "depende do driver GL instalado em sua \n" "placa de vídeo."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl2")) { snprintf(s, len, "Driver de Vídeo SDL 2.\n" @@ -134,7 +134,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len) "renderização por software depende da \n" "implementação SDL de sua plataforma."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl1")) { snprintf(s, len, "Driver de Vídeo SDL.\n" @@ -145,7 +145,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len) "O desemprenho é considerado subótimo. \n" "Considere seu uso apenas em último caso."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3)) + else if (string_is_equal(settings->arrays.video_driver, "d3d")) { snprintf(s, len, "Driver de Vídeo Direct3D. \n" @@ -154,7 +154,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len) "renderização por software depende do driver \n" "D3D instalado em sua placa de vídeo."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6)) + else if (string_is_equal(settings->arrays.video_driver, "exynos")) { snprintf(s, len, "Driver de Vídeo Exynos-G2D. \n" @@ -166,7 +166,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len) "O desempenho para cores de renderização por \n" "software deve ser ótimo."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5)) + else if (string_is_equal(settings->arrays.video_driver, "sunxi")) { snprintf(s, len, "Driver de Vídeo Sunxi-G2D. \n" diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index 9219d9276d..ff2c544bb9 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -793,7 +793,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Current Video driver."); - if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2)) + if (string_is_equal(settings->arrays.video_driver, "gl")) { snprintf(s, len, "OpenGL Video driver. \n" @@ -807,7 +807,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) "dependent on your graphics card's \n" "underlying GL driver)."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl2")) { snprintf(s, len, "SDL 2 Video driver.\n" @@ -819,7 +819,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) "core implementations is dependent \n" "on your platform SDL implementation."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl1")) { snprintf(s, len, "SDL Video driver.\n" @@ -830,7 +830,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) "Performance is considered to be suboptimal. \n" "Consider using it only as a last resort."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3)) + else if (string_is_equal(settings->arrays.video_driver, "d3d")) { snprintf(s, len, "Direct3D Video driver. \n" @@ -839,7 +839,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) "is dependent on your graphic card's \n" "underlying D3D driver)."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6)) + else if (string_is_equal(settings->arrays.video_driver, "exynos")) { snprintf(s, len, "Exynos-G2D Video Driver. \n" @@ -851,7 +851,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) "Performance for software rendered cores \n" "should be optimal."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "drm", 3)) + else if (string_is_equal(settings->arrays.video_driver, "drm")) { snprintf(s, len, "Plain DRM Video Driver. \n" @@ -860,7 +860,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) "libdrm for hardware scaling using \n" "GPU overlays."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5)) + else if (string_is_equal(settings->arrays.video_driver, "sunxi")) { snprintf(s, len, "Sunxi-G2D Video Driver. \n" diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index a74b461a32..946ce5a783 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -781,7 +781,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Current Video driver."); - if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2)) + if (string_is_equal(settings->arrays.video_driver, "gl")) { snprintf(s, len, "OpenGL Video driver. \n" @@ -795,7 +795,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) "dependent on your graphics card's \n" "underlying GL driver)."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl2")) { snprintf(s, len, "SDL 2 Video driver.\n" @@ -807,7 +807,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) "core implementations is dependent \n" "on your platform SDL implementation."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4)) + else if (string_is_equal(settings->arrays.video_driver, "sdl1")) { snprintf(s, len, "SDL Video driver.\n" @@ -818,7 +818,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) "Performance is considered to be suboptimal. \n" "Consider using it only as a last resort."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3)) + else if (string_is_equal(settings->arrays.video_driver, "d3d")) { snprintf(s, len, "Direct3D Video driver. \n" @@ -827,7 +827,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) "is dependent on your graphic card's \n" "underlying D3D driver)."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6)) + else if (string_is_equal(settings->arrays.video_driver, "exynos")) { snprintf(s, len, "Exynos-G2D Video Driver. \n" @@ -839,7 +839,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) "Performance for software rendered cores \n" "should be optimal."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "drm", 3)) + else if (string_is_equal(settings->arrays.video_driver, "drm")) { snprintf(s, len, "Plain DRM Video Driver. \n" @@ -848,7 +848,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) "libdrm for hardware scaling using \n" "GPU overlays."); } - else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5)) + else if (string_is_equal(settings->arrays.video_driver, "sunxi")) { snprintf(s, len, "Sunxi-G2D Video Driver. \n" diff --git a/libretro-common/file/config_file.c b/libretro-common/file/config_file.c index 14e8cf7932..455d3aa513 100644 --- a/libretro-common/file/config_file.c +++ b/libretro-common/file/config_file.c @@ -720,13 +720,13 @@ bool config_get_bool(config_file_t *conf, const char *key, bool *in) if (entry) { - if (string_is_equal_fast(entry->value, "true", 4)) + if (string_is_equal(entry->value, "true")) *in = true; - else if (string_is_equal_fast(entry->value, "1", 1)) + else if (string_is_equal(entry->value, "1")) *in = true; - else if (string_is_equal_fast(entry->value, "false", 5)) + else if (string_is_equal(entry->value, "false")) *in = false; - else if (string_is_equal_fast(entry->value, "0", 1)) + else if (string_is_equal(entry->value, "0")) *in = false; else return false; diff --git a/libretro-common/formats/png/rpng.c b/libretro-common/formats/png/rpng.c index 25af630da0..c11ed8e4c5 100644 --- a/libretro-common/formats/png/rpng.c +++ b/libretro-common/formats/png/rpng.c @@ -152,7 +152,7 @@ static enum png_chunk_type png_chunk_type(const struct png_chunk *chunk) for (i = 0; i < ARRAY_SIZE(chunk_map); i++) { - if (string_is_equal_fast(chunk->type, chunk_map[i].id, 4)) + if (string_is_equal(chunk->type, chunk_map[i].id)) return chunk_map[i].type; } diff --git a/libretro-common/net/net_http.c b/libretro-common/net/net_http.c index 575971dde1..b5eeb8849f 100644 --- a/libretro-common/net/net_http.c +++ b/libretro-common/net/net_http.c @@ -381,7 +381,7 @@ struct http_t *net_http_new(struct http_connection_t *conn) net_http_send_str(&conn->sock_state, &error, "\r\n"); } - if (conn->methodcopy && (string_is_equal_fast(conn->methodcopy, "POST", 4))) + if (conn->methodcopy && (string_is_equal(conn->methodcopy, "POST"))) { size_t post_len, len; char *len_str = NULL; @@ -418,7 +418,7 @@ struct http_t *net_http_new(struct http_connection_t *conn) net_http_send_str(&conn->sock_state, &error, "Connection: close\r\n"); net_http_send_str(&conn->sock_state, &error, "\r\n"); - if (conn->methodcopy && (string_is_equal_fast(conn->methodcopy, "POST", 4))) + if (conn->methodcopy && (string_is_equal(conn->methodcopy, "POST"))) net_http_send_str(&conn->sock_state, &error, conn->postdatacopy); if (error) diff --git a/libretro-common/streams/trans_stream_zlib.c b/libretro-common/streams/trans_stream_zlib.c index b9f6a993a4..d37e6b9713 100644 --- a/libretro-common/streams/trans_stream_zlib.c +++ b/libretro-common/streams/trans_stream_zlib.c @@ -75,7 +75,7 @@ static void zlib_inflate_stream_free(void *data) static bool zlib_deflate_define(void *data, const char *prop, uint32_t val) { struct zlib_trans_stream *z = (struct zlib_trans_stream *) data; - if (string_is_equal_fast(prop, "level", 5)) + if (string_is_equal(prop, "level")) { if (z) z->ex = (int) val; @@ -87,7 +87,7 @@ static bool zlib_deflate_define(void *data, const char *prop, uint32_t val) static bool zlib_inflate_define(void *data, const char *prop, uint32_t val) { struct zlib_trans_stream *z = (struct zlib_trans_stream *) data; - if (string_is_equal_fast(prop, "window_bits", 11)) + if (string_is_equal(prop, "window_bits")) { if (z) z->ex = (int) val; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 45d88aeef0..b308e8e180 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -2523,7 +2523,7 @@ static int menu_displaylist_parse_horizontal_list( playlist_qsort(playlist); - if (string_is_equal_fast(lpl_basename, "content_history", 15)) + if (string_is_equal(lpl_basename, "content_history")) is_historylist = true; menu_displaylist_parse_playlist(info, @@ -5388,7 +5388,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_CHEEVOS_LEADERBOARDS_ENABLE, PARSE_ONLY_BOOL, false); - if (string_is_equal_fast(settings->arrays.menu_driver, "xmb", 3)) + if (string_is_equal(settings->arrays.menu_driver, "xmb")) { menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_CHEEVOS_BADGES_ENABLE, @@ -5434,7 +5434,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) break; case DISPLAYLIST_WIFI_SETTINGS_LIST: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); - if (string_is_equal_fast(settings->arrays.wifi_driver, "null", 4)) + if (string_is_equal(settings->arrays.wifi_driver, "null")) menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_NETWORKS_FOUND), msg_hash_to_str(MENU_ENUM_LABEL_NO_NETWORKS_FOUND), diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 018a1a2277..9170871784 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -209,39 +209,39 @@ static bool menu_display_check_compatibility( case MENU_VIDEO_DRIVER_GENERIC: return true; case MENU_VIDEO_DRIVER_OPENGL: - if (string_is_equal_fast(video_driver, "gl", 2)) + if (string_is_equal(video_driver, "gl")) return true; break; case MENU_VIDEO_DRIVER_VULKAN: - if (string_is_equal_fast(video_driver, "vulkan", 6)) + if (string_is_equal(video_driver, "vulkan")) return true; break; case MENU_VIDEO_DRIVER_DIRECT3D: - if (string_is_equal_fast(video_driver, "d3d", 3)) + if (string_is_equal(video_driver, "d3d")) return true; break; case MENU_VIDEO_DRIVER_VITA2D: - if (string_is_equal_fast(video_driver, "vita2d", 6)) + if (string_is_equal(video_driver, "vita2d")) return true; break; case MENU_VIDEO_DRIVER_CTR: - if (string_is_equal_fast(video_driver, "ctr", 3)) + if (string_is_equal(video_driver, "ctr")) return true; break; case MENU_VIDEO_DRIVER_WIIU: - if (string_is_equal_fast(video_driver, "gx2", 3)) + if (string_is_equal(video_driver, "gx2")) return true; break; case MENU_VIDEO_DRIVER_CACA: - if (string_is_equal_fast(video_driver, "caca", 4)) + if (string_is_equal(video_driver, "caca")) return true; break; case MENU_VIDEO_DRIVER_GDI: - if (string_is_equal_fast(video_driver, "gdi", 3)) + if (string_is_equal(video_driver, "gdi")) return true; break; case MENU_VIDEO_DRIVER_VGA: - if (string_is_equal_fast(video_driver, "vga", 3)) + if (string_is_equal(video_driver, "vga")) return true; break; } diff --git a/menu/menu_setting.c b/menu/menu_setting.c index d3a01ff384..3ab2d75b4a 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -3439,7 +3439,7 @@ static bool setting_append_list( &setting_get_string_representation_st_float_video_refresh_rate_auto; settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED); - if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2)) + if (string_is_equal(settings->arrays.video_driver, "gl")) { CONFIG_BOOL( list, list_info, @@ -3806,7 +3806,7 @@ static bool setting_append_list( settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO); settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED); - if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2)) + if (string_is_equal(settings->arrays.video_driver, "gl")) { CONFIG_BOOL( list, list_info, @@ -4216,7 +4216,7 @@ static bool setting_append_list( settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED); #ifdef HAVE_WASAPI - if (string_is_equal_fast(settings->arrays.audio_driver, "wasapi", 6)) + if (string_is_equal(settings->arrays.audio_driver, "wasapi")) { CONFIG_BOOL( list, list_info, @@ -5224,7 +5224,7 @@ static bool setting_append_list( settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED); } - if (string_is_equal_fast(settings->arrays.menu_driver, "xmb", 3)) + if (string_is_equal(settings->arrays.menu_driver, "xmb")) { CONFIG_BOOL( list, list_info, @@ -5372,7 +5372,7 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE); - if (string_is_equal_fast(settings->arrays.menu_driver, "xmb", 3)) + if (string_is_equal(settings->arrays.menu_driver, "xmb")) { CONFIG_BOOL( list, list_info, @@ -5471,9 +5471,10 @@ static bool setting_append_list( START_SUB_GROUP(list, list_info, "Display", &group_info, &subgroup_info, parent_group); - /* only GLUI uses these values, don't show them on other drivers */ - if (string_is_equal_fast(settings->arrays.menu_driver, "glui", 4)) + if (string_is_equal(settings->arrays.menu_driver, "glui")) { + /* only GLUI uses these values, don't show + * them on other drivers */ CONFIG_BOOL( list, list_info, &settings->bools.menu_dpi_override_enable, @@ -5504,9 +5505,10 @@ static bool setting_append_list( } #ifdef HAVE_XMB - /* only XMB uses these values, don't show them on other drivers */ - if (string_is_equal_fast(settings->arrays.menu_driver, "xmb", 3)) + if (string_is_equal(settings->arrays.menu_driver, "xmb")) { + /* only XMB uses these values, don't show + * them on other drivers. */ CONFIG_UINT( list, list_info, &settings->uints.menu_xmb_alpha_factor, @@ -5758,7 +5760,7 @@ static bool setting_append_list( #endif #ifdef HAVE_XMB - if (string_is_equal_fast(settings->arrays.menu_driver, "xmb", 3)) + if (string_is_equal(settings->arrays.menu_driver, "xmb")) { CONFIG_BOOL( list, list_info, @@ -5907,9 +5909,10 @@ static bool setting_append_list( #endif #ifdef HAVE_MATERIALUI - /* only MaterialUI uses these values, don't show them on other drivers */ - if (string_is_equal_fast(settings->arrays.menu_driver, "glui", 4)) + if (string_is_equal(settings->arrays.menu_driver, "glui")) { + /* only MaterialUI uses these values, don't show + * them on other drivers. */ CONFIG_BOOL( list, list_info, &settings->bools.menu_materialui_icons_enable, @@ -5983,7 +5986,7 @@ static bool setting_append_list( general_read_handler, SD_FLAG_ADVANCED); - if (string_is_equal_fast(settings->arrays.menu_driver, "xmb", 3)) + if (string_is_equal(settings->arrays.menu_driver, "xmb")) { CONFIG_UINT( list, list_info, diff --git a/menu/widgets/menu_osk.c b/menu/widgets/menu_osk.c index fa354ad085..1e2342bb6f 100644 --- a/menu/widgets/menu_osk.c +++ b/menu/widgets/menu_osk.c @@ -98,16 +98,16 @@ void menu_event_osk_append(int ptr) menu_event_set_osk_idx(OSK_LOWERCASE_LATIN); else if (string_is_equal(osk_grid[ptr],"\xe2\x8a\x95")) /* plus sign (next button) */ #else - if (string_is_equal_fast(osk_grid[ptr], "Bksp", 4)) + if (string_is_equal(osk_grid[ptr], "Bksp")) input_keyboard_event(true, '\x7f', '\x7f', 0, RETRO_DEVICE_KEYBOARD); - else if (string_is_equal_fast(osk_grid[ptr], "Enter", 5)) + else if (string_is_equal(osk_grid[ptr], "Enter")) input_keyboard_event(true, '\n', '\n', 0, RETRO_DEVICE_KEYBOARD); else - if (string_is_equal_fast(osk_grid[ptr], "Upper", 5)) + if (string_is_equal(osk_grid[ptr], "Upper")) menu_event_set_osk_idx(OSK_UPPERCASE_LATIN); - else if (string_is_equal_fast(osk_grid[ptr], "Lower", 5)) + else if (string_is_equal(osk_grid[ptr], "Lower")) menu_event_set_osk_idx(OSK_LOWERCASE_LATIN); - else if (string_is_equal_fast(osk_grid[ptr], "Next", 4)) + else if (string_is_equal(osk_grid[ptr], "Next")) #endif if (menu_event_get_osk_idx() < OSK_TYPE_LAST - 1) menu_event_set_osk_idx((enum osk_type)(menu_event_get_osk_idx() + 1)); diff --git a/network/netplay/netplay_room_parse.c b/network/netplay/netplay_room_parse.c index aebb3b2dde..c339d37edc 100644 --- a/network/netplay/netplay_room_parse.c +++ b/network/netplay/netplay_room_parse.c @@ -197,7 +197,7 @@ static JSON_Parser_HandlerResult JSON_CALL ObjectMemberHandler(JSON_Parser parse return JSON_Parser_Continue; if (pCtx->state == STATE_OBJECT_START && !string_is_empty(pValue) - && string_is_equal_fast(pValue, "fields", 6)) + && string_is_equal(pValue, "fields")) pCtx->state = STATE_FIELDS_START; if (pCtx->state == STATE_FIELDS_OBJECT_START) @@ -208,82 +208,82 @@ static JSON_Parser_HandlerResult JSON_CALL ObjectMemberHandler(JSON_Parser parse if (!string_is_empty(pValue)) { - if (string_is_equal_fast(pValue, "username", 8)) + if (string_is_equal(pValue, "username")) { pCtx->cur_field = strdup(pValue); pCtx->cur_member = &rooms->cur->nickname; } - else if (string_is_equal_fast(pValue, "game_name", 9)) + else if (string_is_equal(pValue, "game_name")) { pCtx->cur_field = strdup(pValue); pCtx->cur_member = &rooms->cur->gamename; } - else if (string_is_equal_fast(pValue, "core_name", 9)) + else if (string_is_equal(pValue, "core_name")) { pCtx->cur_field = strdup(pValue); pCtx->cur_member = &rooms->cur->corename; } - else if (string_is_equal_fast(pValue, "ip", 2)) + else if (string_is_equal(pValue, "ip")) { pCtx->cur_field = strdup(pValue); pCtx->cur_member = &rooms->cur->address; } - else if (string_is_equal_fast(pValue, "port", 4)) + else if (string_is_equal(pValue, "port")) { pCtx->cur_field = strdup(pValue); pCtx->cur_member = &rooms->cur->port; } - else if (string_is_equal_fast(pValue, "game_crc", 8)) + else if (string_is_equal(pValue, "game_crc")) { pCtx->cur_field = strdup(pValue); pCtx->cur_member = &rooms->cur->gamecrc; } - else if (string_is_equal_fast(pValue, "core_version", 12)) + else if (string_is_equal(pValue, "core_version")) { pCtx->cur_field = strdup(pValue); pCtx->cur_member = &rooms->cur->coreversion; } - else if (string_is_equal_fast(pValue, "has_password", 12)) + else if (string_is_equal(pValue, "has_password")) { pCtx->cur_field = strdup(pValue); pCtx->cur_member = &rooms->cur->has_password; } - else if (string_is_equal_fast(pValue, "has_spectate_password", 21)) + else if (string_is_equal(pValue, "has_spectate_password")) { pCtx->cur_field = strdup(pValue); pCtx->cur_member = &rooms->cur->has_spectate_password; } - else if (string_is_equal_fast(pValue, "fixed", 5)) + else if (string_is_equal(pValue, "fixed")) { pCtx->cur_field = strdup(pValue); pCtx->cur_member = &rooms->cur->fixed; } - else if (string_is_equal_fast(pValue, "mitm_ip", 7)) + else if (string_is_equal(pValue, "mitm_ip")) { pCtx->cur_field = strdup(pValue); pCtx->cur_member = &rooms->cur->mitm_address; } - else if (string_is_equal_fast(pValue, "mitm_port", 9)) + else if (string_is_equal(pValue, "mitm_port")) { pCtx->cur_field = strdup(pValue); pCtx->cur_member = &rooms->cur->mitm_port; } - else if (string_is_equal_fast(pValue, "host_method", 11)) + else if (string_is_equal(pValue, "host_method")) { pCtx->cur_field = strdup(pValue); pCtx->cur_member = &rooms->cur->host_method; } - else if (string_is_equal_fast(pValue, "retroarch_version", 17)) + else if (string_is_equal(pValue, "retroarch_version")) { pCtx->cur_field = strdup(pValue); pCtx->cur_member = &rooms->cur->retroarch_version; } - else if (string_is_equal_fast(pValue, "country", 7)) + else if (string_is_equal(pValue, "country")) { pCtx->cur_field = strdup(pValue); pCtx->cur_member = &rooms->cur->country; } - else if (string_is_equal_fast(pValue, "frontend", 7)) + else if (string_is_equal(pValue, "frontend")) { pCtx->cur_field = strdup(pValue); pCtx->cur_member = &rooms->cur->frontend; diff --git a/retroarch.c b/retroarch.c index bb56980c44..9423b8648f 100644 --- a/retroarch.c +++ b/retroarch.c @@ -868,14 +868,14 @@ static void retroarch_parse_input(int argc, char *argv[]) break; case 'M': - if (string_is_equal_fast(optarg, "noload-nosave", 13)) + if (string_is_equal(optarg, "noload-nosave")) { rarch_is_sram_load_disabled = true; rarch_is_sram_save_disabled = true; } - else if (string_is_equal_fast(optarg, "noload-save", 11)) + else if (string_is_equal(optarg, "noload-save")) rarch_is_sram_load_disabled = true; - else if (string_is_equal_fast(optarg, "load-nosave", 11)) + else if (string_is_equal(optarg, "load-nosave")) rarch_is_sram_save_disabled = true; else if (string_is_not_equal_fast(optarg, "load-save", 9)) { diff --git a/setting_list.c b/setting_list.c index 199777f3d5..09b0eff5a1 100644 --- a/setting_list.c +++ b/setting_list.c @@ -336,9 +336,9 @@ int setting_set_with_string_representation(rarch_setting_t* setting, strlcpy(setting->value.target.string, value, setting->size); break; case ST_BOOL: - if (string_is_equal_fast(value, "true", 4)) + if (string_is_equal(value, "true")) *setting->value.target.boolean = true; - else if (string_is_equal_fast(value, "false", 5)) + else if (string_is_equal(value, "false")) *setting->value.target.boolean = false; break; default: diff --git a/tasks/task_autodetect.c b/tasks/task_autodetect.c index c0753434c1..8feb418104 100644 --- a/tasks/task_autodetect.c +++ b/tasks/task_autodetect.c @@ -233,7 +233,7 @@ static void input_autoconfigure_joypad_add(config_file_t *conf, input_autoconfigure_joypad_conf(conf, input_autoconf_binds[params->idx]); - if (string_is_equal_fast(device_type, "remote", 6)) + if (string_is_equal(device_type, "remote")) { static bool remote_is_bound = false; diff --git a/tasks/task_database.c b/tasks/task_database.c index a3d200627d..d792548a27 100644 --- a/tasks/task_database.c +++ b/tasks/task_database.c @@ -175,19 +175,19 @@ static int intfstream_get_serial(intfstream_t *fd, char *serial) return 0; } - if (string_is_equal_fast(system_name, "psp", 3)) + if (string_is_equal(system_name, "psp")) { if (detect_psp_game(fd, serial) == 0) return 0; RARCH_LOG("%s '%s'\n", msg_hash_to_str(MSG_FOUND_DISK_LABEL), serial); } - else if (string_is_equal_fast(system_name, "ps1", 3)) + else if (string_is_equal(system_name, "ps1")) { if (detect_ps1_game(fd, serial) == 0) return 0; RARCH_LOG("%s '%s'\n", msg_hash_to_str(MSG_FOUND_DISK_LABEL), serial); } - else if (string_is_equal_fast(system_name, "gc", 2)) + else if (string_is_equal(system_name, "gc")) { if (detect_gc_game(fd, serial) == 0) return 0; diff --git a/tasks/task_database_cue.c b/tasks/task_database_cue.c index ef43985101..94db29ed40 100644 --- a/tasks/task_database_cue.c +++ b/tasks/task_database_cue.c @@ -382,7 +382,7 @@ int detect_system(intfstream_t *fd, const char **system_name) if (read < MAGIC_LEN) continue; - if (string_is_equal_fast(MAGIC_NUMBERS[i].magic, magic, MAGIC_LEN)) + if (string_is_equal(MAGIC_NUMBERS[i].magic, magic)) { *system_name = MAGIC_NUMBERS[i].system_name; rv = 0; diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m index 244df7b3cb..9917805e70 100644 --- a/ui/drivers/ui_cocoatouch.m +++ b/ui/drivers/ui_cocoatouch.m @@ -486,9 +486,9 @@ enum /* Get enabled orientations */ apple_frontend_settings.orientation_flags = UIInterfaceOrientationMaskAll; - if (string_is_equal_fast(apple_frontend_settings.orientations, "landscape", 9)) + if (string_is_equal(apple_frontend_settings.orientations, "landscape")) apple_frontend_settings.orientation_flags = UIInterfaceOrientationMaskLandscape; - else if (string_is_equal_fast(apple_frontend_settings.orientations, "portrait", 8)) + else if (string_is_equal(apple_frontend_settings.orientations, "portrait")) apple_frontend_settings.orientation_flags = UIInterfaceOrientationMaskPortrait | UIInterfaceOrientationMaskPortraitUpsideDown; }