From bf1bb1e7d906e8f907f4763e4f6d3765f1f8da19 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:51:48 +0100
Subject: [PATCH] Attr: added getter & setter for value
---
sefht.geany | 6 ++--
src/lib/sefht/attr.c | 59 ++++++++++++++++++++++++++++++
src/lib/sefht/attr.h | 13 +++++++
tests/test_attr.c | 86 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 161 insertions(+), 3 deletions(-)
diff --git a/sefht.geany b/sefht.geany
index 75b035f..deca866 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=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_14=5104;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=2279;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=8638;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_attr.c;0;8
+FILE_NAME_30=8032;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 dcca538..3acee6e 100644
--- a/src/lib/sefht/attr.c
+++ b/src/lib/sefht/attr.c
@@ -214,3 +214,62 @@ SH_Attr_set_name (struct SH_Attr * attr,
set_success (status);
return TRUE;
}
+
+/*@null@*/
+/*@only@*/
+char *
+SH_Attr_get_value (const struct SH_Attr * attr,
+ /*@null@*/ /*@out@*/ struct SH_Status * status)
+ /*@*/
+{
+ char * value;
+
+ if (NULL == attr->value)
+ {
+ set_success (status);
+ return NULL;
+ }
+
+ value = strdup (attr->value);
+ if (NULL == value)
+ {
+ set_status (status, E_ALLOC, 3, "strdup failed");
+ return NULL;
+ }
+
+ set_success (status);
+ return value;
+}
+
+bool
+SH_Attr_set_value (struct SH_Attr * attr,
+ const char * value,
+ /*@null@*/ /*@out@*/ struct SH_Status * status)
+ /*@modifies attr->value@*/
+{
+ char * value_copy;
+
+ if (NULL == value)
+ {
+ value_copy = NULL;
+ }
+ else
+ {
+ value_copy = strdup (value);
+ if (NULL == value_copy)
+ {
+ set_status (status, E_ALLOC, 3, "strdup failed");
+ return FALSE;
+ }
+ }
+
+ if (NULL != attr->value)
+ {
+ free (attr->value);
+ }
+
+ attr->value = value_copy;
+
+ set_success (status);
+ return TRUE;
+}
diff --git a/src/lib/sefht/attr.h b/src/lib/sefht/attr.h
index 5270542..96a3b45 100644
--- a/src/lib/sefht/attr.h
+++ b/src/lib/sefht/attr.h
@@ -84,4 +84,17 @@ SH_Attr_set_name (SH_Attr * attr,
/*@null@*/ /*@out@*/ struct SH_Status * status)
/*@modifies attr@*/;
+/*@null@*/
+/*@only@*/
+char *
+SH_Attr_get_value (const SH_Attr * attr,
+ /*@null@*/ /*@out@*/ struct SH_Status * status)
+ /*@*/;
+
+bool
+SH_Attr_set_value (SH_Attr * attr,
+ const char * value,
+ /*@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 7c44626..a09072a 100644
--- a/tests/test_attr.c
+++ b/tests/test_attr.c
@@ -327,6 +327,89 @@ START_TEST(test_attr_name_with_status)
}
END_TEST
+START_TEST(test_attr_value_no_status)
+{
+ struct SH_Attr * attr;
+ const char * name = "name";
+ const char * value1 = "value1";
+ const char * value2 = "value2";
+ char * value;
+ bool result;
+
+ attr = SH_Attr_new (name, NULL, NULL);
+ ck_assert_ptr_ne (NULL, attr);
+ ck_assert_ptr_eq (NULL, attr->value);
+
+ value = SH_Attr_get_value (attr, NULL);
+ ck_assert_ptr_eq (NULL, value);
+
+ result = SH_Attr_set_value (attr, value1, NULL);
+ ck_assert_int_eq (TRUE, result);
+ ck_assert_ptr_ne (value1, attr->value);
+ ck_assert_str_eq (value1, attr->value);
+
+ value = SH_Attr_get_value (attr, NULL);
+ ck_assert_ptr_ne (NULL, value);
+ ck_assert_ptr_ne (value1, value);
+ ck_assert_str_eq (value1, value);
+ free (value);
+
+ result = SH_Attr_set_value (attr, value2, NULL);
+ ck_assert_int_eq (TRUE, result);
+ ck_assert_ptr_ne (value2, attr->value);
+ ck_assert_str_eq (value2, attr->value);
+
+ SH_Attr_free (attr);
+}
+END_TEST
+
+START_TEST(test_attr_value_with_status)
+{
+ struct SH_Status status;
+ struct SH_Attr * attr;
+ const char * name = "name";
+ const char * value1 = "value1";
+ const char * value2 = "value2";
+ char * value;
+ bool result;
+
+ _status_preinit (status);
+ attr = SH_Attr_new (name, NULL, &status);
+ ck_assert_ptr_ne (NULL, attr);
+ ck_assert (succeed (&status));
+ ck_assert_ptr_eq (NULL, attr->value);
+
+ _status_preinit (status);
+ value = SH_Attr_get_value (attr, &status);
+ ck_assert_ptr_eq (NULL, value);
+ ck_assert (succeed (&status));
+
+ _status_preinit (status);
+ result = SH_Attr_set_value (attr, value1, &status);
+ ck_assert_int_eq (TRUE, result);
+ ck_assert (succeed (&status));
+ ck_assert_ptr_ne (value1, attr->value);
+ ck_assert_str_eq (value1, attr->value);
+
+ _status_preinit (status);
+ value = SH_Attr_get_value (attr, &status);
+ ck_assert_ptr_ne (NULL, value);
+ ck_assert (succeed (&status));
+ ck_assert_ptr_ne (value1, value);
+ ck_assert_str_eq (value1, value);
+ free (value);
+
+ _status_preinit (status);
+ result = SH_Attr_set_value (attr, value2, &status);
+ ck_assert_int_eq (TRUE, result);
+ ck_assert (succeed (&status));
+ ck_assert_ptr_ne (value2, attr->value);
+ ck_assert_str_eq (value2, attr->value);
+
+ SH_Attr_free (attr);
+}
+END_TEST
+
Suite * test_suite (void)
{
Suite *s;
@@ -355,6 +438,9 @@ Suite * test_suite (void)
tcase_add_test (tc_core, test_attr_name_no_status);
tcase_add_test (tc_core, test_attr_name_with_status);
+ tcase_add_test (tc_core, test_attr_value_no_status);
+ tcase_add_test (tc_core, test_attr_value_with_status);
+
suite_add_tcase (s, tc_core);
return s;
--
GitLab