From 664374f258f7f68bd66022c2b6109e2b61e9660e 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 17:00:56 +0100
Subject: [PATCH] Attr: added getter & setter for name
---
sefht.geany | 6 ++--
src/lib/sefht/attr.c | 42 +++++++++++++++++++++++
src/lib/sefht/attr.h | 13 +++++++
tests/test_attr.c | 81 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 139 insertions(+), 3 deletions(-)
diff --git a/sefht.geany b/sefht.geany
index ed6eea5..75b035f 100644
--- a/sefht.geany
+++ b/sefht.geany
@@ -43,8 +43,8 @@ FILE_NAME_10=2022;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fp
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=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=2359;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fattr.c;0;8
-FILE_NAME_15=1826;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fattr.h;0;8
+FILE_NAME_14=4170;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fattr.c;0;8
+FILE_NAME_15=2246;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fattr.h;0;8
FILE_NAME_16=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_17=904;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ftext.h;0;8
FILE_NAME_18=1779;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator.c;0;8
@@ -59,7 +59,7 @@ FILE_NAME_26=533;Make;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2
FILE_NAME_27=1085;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_cms.c;0;8
FILE_NAME_28=3283;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_data.c;0;8
FILE_NAME_29=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_30=6640;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_attr.c;0;8
+FILE_NAME_30=8638;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_attr.c;0;8
FILE_NAME_31=11068;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_text.c;0;8
FILE_NAME_32=5744;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_validator.c;0;8
FILE_NAME_33=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/attr.c b/src/lib/sefht/attr.c
index 883d387..dcca538 100644
--- a/src/lib/sefht/attr.c
+++ b/src/lib/sefht/attr.c
@@ -172,3 +172,45 @@ SH_Attr_free (/*@only@*/ struct SH_Attr * attr)
return;
}
+
+/*@null@*/
+/*@only@*/
+char *
+SH_Attr_get_name (const struct SH_Attr * attr,
+ /*@null@*/ /*@out@*/ struct SH_Status * status)
+ /*@*/
+{
+ char * name;
+
+ name = strdup (attr->name);
+ if (NULL == name)
+ {
+ set_status (status, E_ALLOC, 3, "strdup failed");
+ return NULL;
+ }
+
+ set_success (status);
+ return name;
+}
+
+bool
+SH_Attr_set_name (struct SH_Attr * attr,
+ const char * name,
+ /*@null@*/ /*@out@*/ struct SH_Status * status)
+ /*@modifies attr->name@*/
+{
+ char * name_copy;
+
+ name_copy = strdup (name);
+ if (NULL == name_copy)
+ {
+ set_status (status, E_ALLOC, 3, "strdup failed");
+ return FALSE;
+ }
+
+ free (attr->name);
+ attr->name = name_copy;
+
+ set_success (status);
+ return TRUE;
+}
diff --git a/src/lib/sefht/attr.h b/src/lib/sefht/attr.h
index 827e2eb..5270542 100644
--- a/src/lib/sefht/attr.h
+++ b/src/lib/sefht/attr.h
@@ -71,4 +71,17 @@ SH_Attr_free (/*@only@*/ SH_Attr * attr)
/*@modifies attr@*/
/*@releases attr@*/;
+/*@null@*/
+/*@only@*/
+char *
+SH_Attr_get_name (const SH_Attr * attr,
+ /*@null@*/ /*@out@*/ struct SH_Status * status)
+ /*@*/;
+
+bool
+SH_Attr_set_name (SH_Attr * attr,
+ const char * name,
+ /*@null@*/ /*@out@*/ struct SH_Status * status)
+ /*@modifies attr@*/;
+
#endif /* SEFHT_ATTR_H */
diff --git a/tests/test_attr.c b/tests/test_attr.c
index 68740a7..7c44626 100644
--- a/tests/test_attr.c
+++ b/tests/test_attr.c
@@ -250,6 +250,83 @@ START_TEST(test_attr_copy2_with_status)
}
END_TEST
+START_TEST(test_attr_name_no_status)
+{
+ struct SH_Attr * attr;
+ const char * name1 = "name1";
+ const char * name2 = "name2";
+ char * name;
+ bool result;
+
+ attr = SH_Attr_new (name1, NULL, NULL);
+ ck_assert_ptr_ne (NULL, attr);
+ ck_assert_ptr_ne (name1, attr->name);
+ ck_assert_str_eq (name1, attr->name);
+
+ name = SH_Attr_get_name (attr, NULL);
+ ck_assert_ptr_ne (NULL, name);
+ ck_assert_ptr_ne (name1, name);
+ ck_assert_str_eq (name1, name);
+ free (name);
+
+ result = SH_Attr_set_name (attr, name2, NULL);
+ ck_assert_int_eq (TRUE, result);
+ ck_assert_ptr_ne (name2, attr->name);
+ ck_assert_str_eq (name2, attr->name);
+
+ name = SH_Attr_get_name (attr, NULL);
+ ck_assert_ptr_ne (NULL, name);
+ ck_assert_ptr_ne (name2, name);
+ ck_assert_str_eq (name2, name);
+ free (name);
+
+ SH_Attr_free (attr);
+}
+END_TEST
+
+START_TEST(test_attr_name_with_status)
+{
+ struct SH_Status status;
+ struct SH_Attr * attr;
+ const char * name1 = "name1";
+ const char * name2 = "name2";
+ char * name;
+ bool result;
+
+ _status_preinit (status);
+ attr = SH_Attr_new (name1, NULL, &status);
+ ck_assert_ptr_ne (NULL, attr);
+ ck_assert (succeed (&status));
+ ck_assert_ptr_ne (name1, attr->name);
+ ck_assert_str_eq (name1, attr->name);
+
+ _status_preinit (status);
+ name = SH_Attr_get_name (attr, &status);
+ ck_assert_ptr_ne (NULL, name);
+ ck_assert (succeed (&status));
+ ck_assert_ptr_ne (name1, name);
+ ck_assert_str_eq (name1, name);
+ free (name);
+
+ _status_preinit (status);
+ result = SH_Attr_set_name (attr, name2, &status);
+ ck_assert_int_eq (TRUE, result);
+ ck_assert (succeed (&status));
+ ck_assert_ptr_ne (name2, attr->name);
+ ck_assert_str_eq (name2, attr->name);
+
+ _status_preinit (status);
+ name = SH_Attr_get_name (attr, &status);
+ ck_assert_ptr_ne (NULL, name);
+ ck_assert (succeed (&status));
+ ck_assert_ptr_ne (name2, name);
+ ck_assert_str_eq (name2, name);
+ free (name);
+
+ SH_Attr_free (attr);
+}
+END_TEST
+
Suite * test_suite (void)
{
Suite *s;
@@ -274,6 +351,10 @@ Suite * test_suite (void)
tcase_add_test (tc_core, test_attr_copy1_with_status);
tcase_add_test (tc_core, test_attr_copy2_no_status);
tcase_add_test (tc_core, test_attr_copy2_with_status);
+
+ tcase_add_test (tc_core, test_attr_name_no_status);
+ tcase_add_test (tc_core, test_attr_name_with_status);
+
suite_add_tcase (s, tc_core);
return s;
--
GitLab