mirror of https://github.com/openssl/openssl.git
demos: use array memory (re)allocation routines
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
This commit is contained in:
parent
f0a1e3c5a9
commit
0bd20c05f4
|
@ -975,7 +975,8 @@ create_poll_manager(void)
|
|||
return NULL;
|
||||
|
||||
ossl_list_pe_init(&pm->pm_head);
|
||||
pm->pm_poll_set = OPENSSL_malloc(sizeof (struct poll_event) * POLL_GROW);
|
||||
pm->pm_poll_set = OPENSSL_malloc_array(POLL_GROW,
|
||||
sizeof (struct poll_event));
|
||||
if (pm->pm_poll_set != NULL) {
|
||||
pm->pm_poll_set_sz = POLL_GROW;
|
||||
pm->pm_event_count = 0;
|
||||
|
@ -992,7 +993,6 @@ rebuild_poll_set(struct poll_manager *pm)
|
|||
{
|
||||
struct poll_event *new_poll_set;
|
||||
struct poll_event *pe;
|
||||
size_t new_sz;
|
||||
size_t pe_num;
|
||||
size_t i;
|
||||
|
||||
|
@ -1004,9 +1004,9 @@ rebuild_poll_set(struct poll_manager *pm)
|
|||
/*
|
||||
* grow poll set by POLL_GROW
|
||||
*/
|
||||
new_sz = sizeof (struct poll_event) * (pm->pm_poll_set_sz + POLL_GROW);
|
||||
new_poll_set = (struct poll_event *)OPENSSL_realloc(pm->pm_poll_set,
|
||||
new_sz);
|
||||
new_poll_set = OPENSSL_realloc_array(pm->pm_poll_set,
|
||||
pm->pm_poll_set_sz + POLL_GROW,
|
||||
sizeof (struct poll_event));
|
||||
if (new_poll_set == NULL)
|
||||
return -1;
|
||||
pm->pm_poll_set = new_poll_set;
|
||||
|
@ -1016,10 +1016,9 @@ rebuild_poll_set(struct poll_manager *pm)
|
|||
/*
|
||||
* shrink poll set by POLL_DOWNSIZ
|
||||
*/
|
||||
new_sz = sizeof (struct poll_event) *
|
||||
(pm->pm_poll_set_sz - POLL_DOWNSIZ);
|
||||
new_poll_set = (struct poll_event *)OPENSSL_realloc(pm->pm_poll_set,
|
||||
new_sz);
|
||||
new_poll_set = OPENSSL_realloc_array(pm->pm_poll_set,
|
||||
pm->pm_poll_set_sz - POLL_DOWNSIZ,
|
||||
sizeof (struct poll_event));
|
||||
if (new_poll_set == NULL)
|
||||
return -1;
|
||||
pm->pm_poll_set = new_poll_set;
|
||||
|
|
Loading…
Reference in New Issue