mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Fix C++ comments - turn them into C comments for C files

Browse Source 
* Some other additional style nits along the way
This commit is contained in:
LibretroAdmin 2022-10-29 19:05:39 +02:00
parent 3a744b7dae
commit 55daddf286
2 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/gfx_thumbnail_path.c
View File

@ -665,7 +665,8 @@ bool gfx_thumbnail_update_path(
path_data->content_img, PATH_MAX_LENGTH * sizeof(char)); path_data->content_img, PATH_MAX_LENGTH * sizeof(char));
/* Thumbnail fallback 1 - rom_name.png */ /* Thumbnail fallback 1 - rom_name.png */
if ( !path_is_valid(thumbnail_path) ) // :\thumbnails\db_name\Named_Snaps\rom_name.png /* :\thumbnails\db_name\Named_Snaps\rom_name.png */
if (!path_is_valid(thumbnail_path))
{ {
char content_name[PATH_MAX_LENGTH]; char content_name[PATH_MAX_LENGTH];
char* cp = find_last_slash(path_data->content_path); char* cp = find_last_slash(path_data->content_path);
@ -678,7 +679,8 @@ bool gfx_thumbnail_update_path(
fill_pathname_join(thumbnail_path, thumbnail_path, content_name, PATH_MAX_LENGTH); fill_pathname_join(thumbnail_path, thumbnail_path, content_name, PATH_MAX_LENGTH);
} }
/* Thumbnail fallback 2 - rom_path/rom_name.png */ /* Thumbnail fallback 2 - rom_path/rom_name.png */
if ( !path_is_valid(thumbnail_path) ) // :\roms\db_name\rom_name.png /* :\roms\db_name\rom_name.png */
if (!path_is_valid(thumbnail_path))
{ {
char* cp; char* cp;
char content_name[PATH_MAX_LENGTH]; char content_name[PATH_MAX_LENGTH];

53
input/input_driver.c
View File

@ -3231,20 +3231,27 @@ bool input_keyboard_line_event(
if ( character & 0xFF000000 ) /* COMPSTR:0x08000000, RESULTSTR:0x80000000 END:0x01000000*/ if ( character & 0xFF000000 ) /* COMPSTR:0x08000000, RESULTSTR:0x80000000 END:0x01000000*/
{ {
int len = strlen((char*)&composition); size_t len = strlen((char*)&composition);
if( len>0 && state->ptr>=len && state->buffer ) if ( (len > 0)
&& (state->ptr >= len)
&& state->buffer)
{ {
memmove(state->buffer + state->ptr-len, state->buffer+state->ptr, len + 1); memmove(state->buffer + state->ptr-len,
state->ptr -=len; state->buffer+state->ptr, len + 1);
state->size-=len; state->ptr -= len;
state->size -= len;
} }
if(character & 0xF0000000 ) composition = 0; if (character & 0xF0000000)
else composition = character &0xffffff; // GCS_COMPSTR composition = 0;
if(len && composition==0) word = state->buffer; else
composition = character &0xffffff; /* GCS_COMPSTR */
if (len && composition==0)
word = state->buffer;
character &= 0xffffff; character &= 0xffffff;
} }
if ( character==0x0000000D || character==0x0000000A ) /*(c == '\r' || c == '\n') */ /*(c == '\r' || c == '\n') */
if (character==0x0000000D || character==0x0000000A)
{ {
state->cb(state->userdata, state->buffer); state->cb(state->userdata, state->buffer);
ret = true; ret = true;
@ -3255,7 +3262,9 @@ bool input_keyboard_line_event(
{ {
unsigned i; unsigned i;
int len = input_st->osk_last_codepoint_len; int len = input_st->osk_last_codepoint_len;
if( len>0 && state->ptr>=len && state->buffer ) if ( (len > 0)
&& (state->ptr >= len)
&& state->buffer)
{ {
memmove(state->buffer + state->ptr-len, state->buffer + state->ptr, (state->size - state->ptr) + 1); memmove(state->buffer + state->ptr-len, state->buffer + state->ptr, (state->size - state->ptr) + 1);
state->ptr -=len; state->ptr -=len;
@ -3264,13 +3273,10 @@ bool input_keyboard_line_event(
word = state->buffer; //?? word = state->buffer; //??
} }
} else } else
if (character ) if (character)
{
input_keyboard_line_append( state, (char*)&character, strlen((char*)&character)); input_keyboard_line_append( state, (char*)&character, strlen((char*)&character));
} else else
{
return false; return false;
}
/* OSK - update last character */ /* OSK - update last character */
if (word) if (word)
@ -3723,11 +3729,7 @@ int16_t input_state_device(
unsigned remap_button = settings->uints.input_remap_ids[port][id]; unsigned remap_button = settings->uints.input_remap_ids[port][id];
/* TODO/FIXME: What on earth is this code doing...? */ /* TODO/FIXME: What on earth is this code doing...? */
if (! if (!(bind_valid && (id != remap_button)))
( bind_valid
&& id != remap_button
)
)
{ {
if (button_mask) if (button_mask)
{ {
@ -3736,7 +3738,6 @@ int16_t input_state_device(
} }
else else
res = ret; res = ret;
} }
if (BIT256_GET(handle->buttons[port], id)) if (BIT256_GET(handle->buttons[port], id))
@ -4396,10 +4397,12 @@ void input_driver_poll(void)
unsigned remap_axis = settings->uints.input_remap_ids[i][k]; unsigned remap_axis = settings->uints.input_remap_ids[i][k];
if ( if (
(abs(current_axis_value) > 0 && (
(k != remap_axis) && abs(current_axis_value) > 0
(remap_axis != RARCH_UNMAPPED) && (k != remap_axis)
)) && (remap_axis != RARCH_UNMAPPED)
)
)
{ {
if (remap_axis < RARCH_FIRST_CUSTOM_BIND && if (remap_axis < RARCH_FIRST_CUSTOM_BIND &&
abs(current_axis_value) > abs(current_axis_value) >