Update: Remove n longer valid *_delete_simple and *_destroy_simple macros.

diff --git a/level_0/f_account/c/account/common.h b/level_0/f_account/c/account/common.h
index 1c386e6a2de3f8487e9d3f89d4afe18140f07ac5..983e1b5b3f6cf50c9b53ad9b541d53d42a5653ea 100644 (file)
--- a/level_0/f_account/c/account/common.h
+++ b/level_0/f_account/c/account/common.h
@@ -71,9 +71,6 @@ extern "C" {
     macro_f_string_dynamic_t_clear(account.password) \
     macro_f_string_dynamic_t_clear(account.shell) \
   }
-
-  #define macro_f_account_t_delete_simple(accounts)  f_account_delete(&accounts);
-  #define macro_f_account_t_destroy_simple(accounts) f_account_destroy(&accounts);
 #endif // _di_f_account_t_
 
 /**

diff --git a/level_0/f_account/tests/unit/c/test-account-by_id.c b/level_0/f_account/tests/unit/c/test-account-by_id.c
index dd2545fe59e753d6721515673653eef7bc4e7666..93cc1fc8596b47073359a8a6bd14f63010ba3694 100644 (file)
--- a/level_0/f_account/tests/unit/c/test-account-by_id.c
+++ b/level_0/f_account/tests/unit/c/test-account-by_id.c
@@ -44,7 +44,7 @@ void test__f_account_by_id__fails(void **state) {
     assert_int_equal(status, F_status_set_error(statuss[i]));
   } // for
 
-  macro_f_account_t_delete_simple(account);
+  f_account_delete(&account);
 }
 
 void test__f_account_by_id__not_found(void **state) {
@@ -67,7 +67,7 @@ void test__f_account_by_id__not_found(void **state) {
     assert_int_equal(status, F_exist_not);
   }
 
-  macro_f_account_t_delete_simple(account);
+  f_account_delete(&account);
 }
 
 void test__f_account_by_id__parameter_checking(void **state) {
@@ -115,7 +115,7 @@ void test__f_account_by_id__works(void **state) {
     assert_string_equal(account.shell.string, password.pw_shell);
   }
 
-  macro_f_account_t_delete_simple(account);
+  f_account_delete(&account);
 }
 
 #ifdef __cplusplus

diff --git a/level_0/f_account/tests/unit/c/test-account-by_name.c b/level_0/f_account/tests/unit/c/test-account-by_name.c
index 8e5245afda772c7d9658f99e75c2bfd77abd916e..2e2a8eaca0583f0d44895584f273b0f79faee55c 100644 (file)
--- a/level_0/f_account/tests/unit/c/test-account-by_name.c
+++ b/level_0/f_account/tests/unit/c/test-account-by_name.c
@@ -48,7 +48,7 @@ void test__f_account_by_name__fails(void **state) {
     assert_int_equal(status, F_status_set_error(statuss[i]));
   } // for
 
-  macro_f_account_t_delete_simple(account);
+  f_account_delete(&account);
 }
 
 void test__f_account_by_name__not_found(void **state) {
@@ -73,7 +73,7 @@ void test__f_account_by_name__not_found(void **state) {
     assert_int_equal(status, F_exist_not);
   }
 
-  macro_f_account_t_delete_simple(account);
+  f_account_delete(&account);
 }
 
 void test__f_account_by_name__parameter_checking(void **state) {
@@ -125,7 +125,7 @@ void test__f_account_by_name__works(void **state) {
     assert_string_equal(account.shell.string, password.pw_shell);
   }
 
-  macro_f_account_t_delete_simple(account);
+  f_account_delete(&account);
 }
 
 #ifdef __cplusplus