Changed new API names.

[Issue#]       SSDWSSP-183
[Bug/Feature]  Renamed new API names.
[Cause]        N/A
[Solution]     Better api names: perm_begin, perm_end.
[Verification] Build

Change-Id: I3ccadb18292314a5a6f9d636d359a36014135633

diff --git a/api_feature_loader/api_feature_loader.c b/api_feature_loader/api_feature_loader.c
index cd76b0d..9884a6f 100644 (file)
--- a/api_feature_loader/api_feature_loader.c
+++ b/api_feature_loader/api_feature_loader.c
@@ -243,7 +243,7 @@ void load_from_dir(const char  *const s_dir)
 {
 
        API_FEATURE_LOADER_LOG("Loading rules from directory...\n");
-       if(perm_modification_start()) return;
+       if(perm_begin()) return;
 
        // Load rules specific to permission's types:
        load_pemission_type_rules(wrt_filter,         "WRT",          APP_TYPE_WGT,         s_dir);
@@ -259,14 +259,14 @@ void load_from_dir(const char  *const s_dir)
        load_permission_family(osp_family_filter, "OSP_", APP_TYPE_OSP, s_dir);
        load_permission_family(efl_family_filter, "EFL_", APP_TYPE_EFL, s_dir);
 
-       perm_modification_finish();
+       perm_end();
        API_FEATURE_LOADER_LOG("Done.\n");
 }
 
 void load_from_file(const char  *const s_file_path)
 {
        API_FEATURE_LOADER_LOG("Loading rules from file...\n");
-       if(perm_modification_start()) return;
+       if(perm_begin()) return;
 
        char *s_permission_name = NULL;
        char *s_file_name;
@@ -274,6 +274,7 @@ void load_from_file(const char  *const s_file_path)
 
        if(!has_smack_ext(s_file_path)) {
                API_FEATURE_LOADER_LOG("File doesn't have smack extension.");
+               perm_end();
                return;
        }
 
@@ -299,7 +300,7 @@ void load_from_file(const char  *const s_file_path)
 
        free(s_permission_name);
 
-       perm_modification_finish();
+       perm_end();
        API_FEATURE_LOADER_LOG("Done.\n");
 }
 

diff --git a/include/privilege-control.h b/include/privilege-control.h
index 0a121e5..3c905d7 100644 (file)
--- a/include/privilege-control.h
+++ b/include/privilege-control.h
@@ -419,13 +419,13 @@ int add_api_feature(app_type_t app_type,
  * Run before any privilege modification.
  * @return PC_OPERATION_SUCCESS on success, PC_ERR_* on error
  */
-int perm_modification_start(void);
+int perm_begin(void);
 
 /**
  * Run after any privilege modification.
  * @return PC_OPERATION_SUCCESS on success, PC_ERR_* on error
  */
-int perm_modification_finish(void);
+int perm_end(void);
 
 
 #ifdef __cplusplus

diff --git a/src/privilege-control.c b/src/privilege-control.c
index 512458e..b864c60 100644 (file)
--- a/src/privilege-control.c
+++ b/src/privilege-control.c
@@ -93,28 +93,20 @@ enum {
        DECISION_LABEL = 1
 };
 
-
-// __attribute__ ((constructor))
-// static void libprivilege_constructor()
-// {
-//     SECURE_C_LOGD("Entering function: %s.", __func__);
-//     perm_modification_start();
-// }
-
 __attribute__ ((destructor))
 static void libprivilege_destructor()
 {
        SECURE_C_LOGD("Entering function: %s.", __func__);
-       perm_modification_finish();
+       perm_end();
 }
 
-API int perm_modification_start()
+API int perm_begin(void)
 {
        SECURE_C_LOGD("Entering function: %s.", __func__);
        return rdb_modification_start();
 }
 
-API int perm_modification_finish()
+API int perm_end(void)
 {
        SECURE_C_LOGD("Entering function: %s.", __func__);
 
@@ -1448,9 +1440,9 @@ API int perm_app_install(const char* pkg_id)
        char* smack_path AUTO_FREE;
        struct smack_accesses *smack AUTO_SMACK_FREE;
 
-       ret = perm_modification_start();
+       ret = perm_begin();
        if(ret != PC_OPERATION_SUCCESS) {
-               C_LOGE("RDB perm_modification_start failed with: %d", ret);
+               C_LOGE("RDB perm_begin failed with: %d", ret);
                return ret;
        }