denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

id_manager: Use calloc instead of malloc

Browse Source 
This way we don't need to manually initialize the slot status; free
slots are now indicated by 0 though.
This commit is contained in:
Reto Buerki
2013-03-19 15:23:46 +01:00
committed by Tobias Brunner
parent 1ee792f9ea
commit ebe592a393
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon-tkm/src/tkm/tkm_id_manager.c
+4 -10
View File
@@ -84,9 +84,9 @@ METHOD(tkm_id_manager_t, acquire_id, int,
this->locks[kind]->write_lock(this->locks[kind]); this->locks[kind]->write_lock(this->locks[kind]);
for (j = 0; j < this->limits[kind]; j++) for (j = 0; j < this->limits[kind]; j++)
{ {
if (this->ctxids[kind][j]) if (!this->ctxids[kind][j])
{ {
this->ctxids[kind][j] = false; this->ctxids[kind][j] = true;
id = j + 1; id = j + 1;
break; break;
} }
@@ -116,7 +116,7 @@ METHOD(tkm_id_manager_t, release_id, bool,
} }
this->locks[kind]->write_lock(this->locks[kind]); this->locks[kind]->write_lock(this->locks[kind]);
this->ctxids[kind][idx] = true; this->ctxids[kind][idx] = false;
this->locks[kind]->unlock(this->locks[kind]); this->locks[kind]->unlock(this->locks[kind]);
return TRUE; return TRUE;
@@ -142,7 +142,6 @@ tkm_id_manager_t *tkm_id_manager_create(const tkm_limits_t limits)
{ {
private_tkm_id_manager_t *this; private_tkm_id_manager_t *this;
int i; int i;
uint64_t j;
INIT(this, INIT(this,
.public = { .public = {
@@ -155,13 +154,8 @@ tkm_id_manager_t *tkm_id_manager_create(const tkm_limits_t limits)
for (i = 0; i < TKM_CTX_MAX; i++) for (i = 0; i < TKM_CTX_MAX; i++)
{ {
this->limits[i] = limits[i]; this->limits[i] = limits[i];
this->ctxids[i] = malloc(limits[i] * sizeof(bool)); this->ctxids[i] = calloc(limits[i], sizeof(bool));
this->locks[i] = rwlock_create(RWLOCK_TYPE_DEFAULT); this->locks[i] = rwlock_create(RWLOCK_TYPE_DEFAULT);
for (j = 0; j < limits[i]; j++)
{
/* available id slots are in true state (is_available) */
this->ctxids[i][j] = true;
}
DBG2(DBG_LIB, "%N initialized, %llu slot(s)", DBG2(DBG_LIB, "%N initialized, %llu slot(s)",
tkm_context_kind_names, i, limits[i]); tkm_context_kind_names, i, limits[i]);
} }