From 3336df9c4976345ce38ea9d48e600ae3d5ed69a8 Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen Date: Wed, 26 Jan 2011 05:37:59 -0800 Subject: [PATCH] api fixes --- src/smack.c | 4 ++-- src/smack.h | 4 ++-- tests/check_smack.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/smack.c b/src/smack.c index b37b4fb..4af7282 100644 --- a/src/smack.c +++ b/src/smack.c @@ -182,7 +182,7 @@ out: return ret; } -int smack_rule_set_save_kernel(SmackRuleSet handle, const char *path) +int smack_rule_set_apply_kernel(SmackRuleSet handle, const char *path) { struct smack_subject *s, *stmp; struct smack_object *o, *otmp; @@ -212,7 +212,7 @@ int smack_rule_set_save_kernel(SmackRuleSet handle, const char *path) return 0; } -int smack_rule_set_clear_from_kernel(SmackRuleSet handle, const char *path) +int smack_rule_set_clear_kernel(SmackRuleSet handle, const char *path) { struct smack_subject *s, *stmp; struct smack_object *o, *otmp; diff --git a/src/smack.h b/src/smack.h index fcd9a99..5bcfb79 100644 --- a/src/smack.h +++ b/src/smack.h @@ -76,7 +76,7 @@ extern int smack_rule_set_save_config(SmackRuleSet handle, const char *path); * @param path path to the SmackFS load file * @return 0 on success */ -extern int smack_rule_set_save_kernel(SmackRuleSet handle, const char *path); +extern int smack_rule_set_apply_kernel(SmackRuleSet handle, const char *path); /*! * Clear rules from kernel. @@ -85,7 +85,7 @@ extern int smack_rule_set_save_kernel(SmackRuleSet handle, const char *path); * @param path path to the rules file * @return 0 on success */ -extern int smack_rule_set_clear_from_kernel(SmackRuleSet handle, const char *path); +extern int smack_rule_set_clear_kernel(SmackRuleSet handle, const char *path); /*! * Add new rule to a rule set. Updates existing rule if there is already rule diff --git a/tests/check_smack.c b/tests/check_smack.c index 03f41f6..0a77bfe 100644 --- a/tests/check_smack.c +++ b/tests/check_smack.c @@ -44,7 +44,7 @@ START_TEST(test_save_to_kernel) smack_rule_set_remove(rules, "Plum", "Peach"); - rc = smack_rule_set_save_kernel( + rc = smack_rule_set_apply_kernel( rules, "test_save_to_kernel-result.txt"); fail_unless(rc == 0, "Failed to write the rule set"); -- 2.7.4