mirror of
https://github.com/libretro/RetroArch
synced 2025-03-19 16:21:30 +00:00
Cleanups/simplifications
This commit is contained in:
parent
dd2844a2ac
commit
b846599cc7
24
retroarch.c
24
retroarch.c
@ -25819,10 +25819,16 @@ static const char **input_keyboard_start_line(void *userdata,
|
|||||||
{
|
{
|
||||||
struct rarch_state *p_rarch = &rarch_st;
|
struct rarch_state *p_rarch = &rarch_st;
|
||||||
input_keyboard_line_t *state = (input_keyboard_line_t*)
|
input_keyboard_line_t *state = (input_keyboard_line_t*)
|
||||||
calloc(1, sizeof(*state));
|
malloc(sizeof(*state));
|
||||||
if (!state)
|
if (!state)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
state->buffer = NULL;
|
||||||
|
state->ptr = 0;
|
||||||
|
state->size = 0;
|
||||||
|
state->cb = NULL;
|
||||||
|
state->userdata = NULL;
|
||||||
|
|
||||||
p_rarch->keyboard_line = state;
|
p_rarch->keyboard_line = state;
|
||||||
p_rarch->keyboard_line->cb = cb;
|
p_rarch->keyboard_line->cb = cb;
|
||||||
p_rarch->keyboard_line->userdata = userdata;
|
p_rarch->keyboard_line->userdata = userdata;
|
||||||
@ -33623,9 +33629,6 @@ static void mylist_create(my_list **list_p, int initial_capacity,
|
|||||||
if (!list_p)
|
if (!list_p)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (initial_capacity < 0)
|
|
||||||
initial_capacity = 0;
|
|
||||||
|
|
||||||
list = *list_p;
|
list = *list_p;
|
||||||
if (list)
|
if (list)
|
||||||
mylist_destroy(list_p);
|
mylist_destroy(list_p);
|
||||||
@ -33635,17 +33638,8 @@ static void mylist_create(my_list **list_p, int initial_capacity,
|
|||||||
list->size = 0;
|
list->size = 0;
|
||||||
list->constructor = constructor;
|
list->constructor = constructor;
|
||||||
list->destructor = destructor;
|
list->destructor = destructor;
|
||||||
|
list->data = (void**)calloc(initial_capacity, sizeof(void*));
|
||||||
if (initial_capacity > 0)
|
list->capacity = initial_capacity;
|
||||||
{
|
|
||||||
list->data = (void**)calloc(initial_capacity, sizeof(void*));
|
|
||||||
list->capacity = initial_capacity;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
list->data = NULL;
|
|
||||||
list->capacity = 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *input_list_element_constructor(void)
|
static void *input_list_element_constructor(void)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user