niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change sertopic "deinit" to "free"

Browse source 
The primary reason is that this allows the implementator of the sertopic
to freely select an allocation strategy, instead of being forced to
allocate the sertopic itself and the names it contains in the common
header with ddsrt_malloc.  The secondary reason is that it brings it in
line with the serdata.

Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2019-05-05 11:25:18 +08:00 • committed by eboasson
parent 0a7e5ff8eb
commit 68c21c06e3
4 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/core/ddsc/src/dds_sertopic_builtintopic.c
View file

@ -45,9 +45,12 @@ struct ddsi_sertopic *new_sertopic_builtintopic (enum ddsi_sertopic_builtintopic
return &tp->c;
}
static void sertopic_builtin_deinit (struct ddsi_sertopic *tp)
static void sertopic_builtin_free (struct ddsi_sertopic *tp)
{
(void)tp;
ddsrt_free (tp->name_type_name);
ddsrt_free (tp->name);
ddsrt_free (tp->type_name);
ddsrt_free (tp);
}
static void free_pp (void *vsample)
@ -141,7 +144,7 @@ static void sertopic_builtin_free_samples (const struct ddsi_sertopic *sertopic_
}
const struct ddsi_sertopic_ops ddsi_sertopic_ops_builtintopic = {
.deinit = sertopic_builtin_deinit,
.free = sertopic_builtin_free,
.zero_samples = sertopic_builtin_zero_samples,
.realloc_samples = sertopic_builtin_realloc_samples,
.free_samples = sertopic_builtin_free_samples