API cleanup for save functions

diff --git a/src/smack.c b/src/smack.c
index 6035a34..b37b4fb 100644 (file)
--- a/src/smack.c
+++ b/src/smack.c
@@ -147,7 +147,7 @@ void smack_rule_set_delete(SmackRuleSet handle)
        free(handle);
 }
 
-int smack_rule_set_save_to_file(SmackRuleSet handle, const char *path)
+int smack_rule_set_save_config(SmackRuleSet handle, const char *path)
 {
        struct smack_subject *s, *stmp;
        struct smack_object *o, *otmp;
@@ -182,7 +182,7 @@ out:
        return ret;
 }
 
-int smack_rule_set_save_to_kernel(SmackRuleSet handle, const char *path)
+int smack_rule_set_save_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 1f42f12..fcd9a99 100644 (file)
--- a/src/smack.h
+++ b/src/smack.h
@@ -67,7 +67,7 @@ extern void smack_rule_set_delete(SmackRuleSet handle);
  * @param path path to the rules file
  * @return 0 on success
  */
-extern int smack_rule_set_save_to_file(SmackRuleSet handle, const char *path);
+extern int smack_rule_set_save_config(SmackRuleSet handle, const char *path);
 
 /*!
  * Write rules to /smack/load. Does not write rules with no access defined.
@@ -76,7 +76,7 @@ extern int smack_rule_set_save_to_file(SmackRuleSet handle, const char *path);
  * @param path path to the SmackFS load file
  * @return 0 on success
  */
-extern int smack_rule_set_save_to_kernel(SmackRuleSet handle, const char *path);
+extern int smack_rule_set_save_kernel(SmackRuleSet handle, const char *path);
 
 /*!
  * Clear rules from kernel.

diff --git a/tests/check_smack.c b/tests/check_smack.c
index 91a1101..03f41f6 100644 (file)
--- 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_to_kernel(
+       rc = smack_rule_set_save_kernel(
                rules,
                "test_save_to_kernel-result.txt");
        fail_unless(rc == 0, "Failed to write the rule set");
@@ -75,7 +75,7 @@ START_TEST(test_save_to_file)
 
        smack_rule_set_remove(rules, "Plum", "Peach");
 
-       rc = smack_rule_set_save_to_file(
+       rc = smack_rule_set_save_config(
                rules,
                "test_save_to_file-result.txt");
        fail_unless(rc == 0, "Failed to write the rule set");