From 40f915d6ac9787e504eaa2f4505cb5b36fc2b9d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonathan=20Sch=C3=B6bel?= <jonathan@xn--schbel-yxa.info>
Date: Fri, 17 Mar 2023 15:44:09 +0100
Subject: [PATCH] NodeFragment: renamed allocation size function
The function get_alloc_size was renamed to get_child_alloc_size as the
attributes will need another function.
---
sefht.geany | 4 ++--
src/lib/sefht/node_fragment.c | 8 ++++----
tests/test_node_fragment.c | 12 ++++++------
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/sefht.geany b/sefht.geany
index a36946c..3fcaeb6 100644
--- a/sefht.geany
+++ b/sefht.geany
@@ -41,7 +41,7 @@ FILE_NAME_8=1550;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fpr
FILE_NAME_9=1562;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ffragment.h;0;8
FILE_NAME_10=2022;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ffragment_data.c;0;8
FILE_NAME_11=2558;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ffragment_class.c;0;8
-FILE_NAME_12=15951;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fnode_fragment.c;0;8
+FILE_NAME_12=2167;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fnode_fragment.c;0;8
FILE_NAME_13=5930;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fnode_fragment.h;0;8
FILE_NAME_14=25820;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ftext.c;0;8
FILE_NAME_15=904;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ftext.h;0;8
@@ -56,7 +56,7 @@ FILE_NAME_23=1078;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fp
FILE_NAME_24=290;Make;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2FMakefile.am;0;8
FILE_NAME_25=1085;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_cms.c;0;8
FILE_NAME_26=3283;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_data.c;0;8
-FILE_NAME_27=51595;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_node_fragment.c;0;8
+FILE_NAME_27=8770;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_node_fragment.c;0;8
FILE_NAME_28=11068;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_text.c;0;8
FILE_NAME_29=5744;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_validator.c;0;8
FILE_NAME_30=165;None;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftodo.txt;0;8
diff --git a/src/lib/sefht/node_fragment.c b/src/lib/sefht/node_fragment.c
index 6e3e498..281dcd3 100644
--- a/src/lib/sefht/node_fragment.c
+++ b/src/lib/sefht/node_fragment.c
@@ -83,7 +83,7 @@ static const struct fragment_methods methods = {
static inline
size_t
-get_alloc_size (size_t size)
+get_child_alloc_size (size_t size)
/*@*/
{
/* underflow */
@@ -295,7 +295,7 @@ SH_NodeFragment_deepcopy (const struct SH_NodeFragment * fragment,
copy->child_n = fragment->child_n;
- copy->child_s = get_alloc_size (fragment->child_n);
+ copy->child_s = get_child_alloc_size (fragment->child_n);
copy->childs = malloc (copy->child_s * sizeof (*copy->childs));
if (copy->child_s != 0 && copy->childs == NULL)
@@ -529,7 +529,7 @@ insert_child (struct SH_NodeFragment * fragment,
return FALSE;
}
- new_size = get_alloc_size (fragment->child_n + 1);
+ new_size = get_child_alloc_size (fragment->child_n + 1);
if (new_size > fragment->child_s)
{
if ((SIZE_MAX / sizeof (*new_childs)) < new_size)
@@ -723,7 +723,7 @@ remove_child (struct SH_NodeFragment * fragment, size_t position,
fragment->childs[index-1] = fragment->childs[index];
}
- new_size = get_alloc_size (fragment->child_n - 1);
+ new_size = get_child_alloc_size (fragment->child_n - 1);
if (new_size < fragment->child_s)
{
new_childs = realloc (fragment->childs, new_size
diff --git a/tests/test_node_fragment.c b/tests/test_node_fragment.c
index 35f2cdd..f89cfaa 100644
--- a/tests/test_node_fragment.c
+++ b/tests/test_node_fragment.c
@@ -292,14 +292,14 @@ END_TEST
START_TEST(test_node_fragment_child_alloc)
{
- ck_assert_int_eq (0, get_alloc_size (0));
- ck_assert_int_eq (CHILD_CHUNK, get_alloc_size (1));
- ck_assert_int_eq (CHILD_CHUNK, get_alloc_size (CHILD_CHUNK));
- ck_assert_int_eq (2*CHILD_CHUNK, get_alloc_size (CHILD_CHUNK+1));
- ck_assert_int_eq (SIZE_MAX, get_alloc_size (SIZE_MAX));
+ ck_assert_int_eq (0, get_child_alloc_size (0));
+ ck_assert_int_eq (CHILD_CHUNK, get_child_alloc_size (1));
+ ck_assert_int_eq (CHILD_CHUNK, get_child_alloc_size (CHILD_CHUNK));
+ ck_assert_int_eq (2*CHILD_CHUNK, get_child_alloc_size (CHILD_CHUNK+1));
+ ck_assert_int_eq (SIZE_MAX, get_child_alloc_size (SIZE_MAX));
for (size_t i = 0; i < CHILD_CHUNK; i++)
{
- ck_assert_int_le (SIZE_MAX-i, get_alloc_size (SIZE_MAX-i));
+ ck_assert_int_le (SIZE_MAX-i, get_child_alloc_size (SIZE_MAX-i));
}
}
END_TEST
--
GitLab