resource-manager: Change variable name

There will be another type, instance_type, which denotes how an resource
instance operates. To clearly distinguish role of those variables, change
variable name type to resource_type.

Change-Id: I2b5dd012d86cc7869da7206feea4ffad7f1dd8c3
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>

diff --git a/src/resource-manager/resource-manager.c b/src/resource-manager/resource-manager.c
index 83532eae83e86a194ebc20f61ee853c61c27d965..5f3fa1e97ebcb811fc68db6dd631037448e71043 100644 (file)
--- a/src/resource-manager/resource-manager.c
+++ b/src/resource-manager/resource-manager.c
@@ -41,7 +41,7 @@ struct syscommon_resman_resource {
        char *name;
        int id;
        const struct syscommon_resman_resource_driver *driver;
-       int type;
+       int resource_type; /* which type of resource */
 
        int num_attrs;
        const struct syscommon_resman_resource_attribute *attrs;
@@ -221,7 +221,7 @@ syscommon_resman_create_resource(int *resource_id, int resource_type)
                return -ENOMEM;
 
        resource->id = alloc_resource_id();
-       resource->type = resource_type;
+       resource->resource_type = resource_type;
        resource->name = g_strdup(driver->name);
        resource->driver = driver;
        resource->num_attrs = driver->num_attrs;
@@ -340,7 +340,7 @@ syscommon_resman_monitor_update_resource_attrs(int resource_id)
        int i, ret;
        struct syscommon_resman_resource *resource = find_resource(resource_id);
 
-       if (!resource || !resource->type)
+       if (!resource || !resource->resource_type)
                return -EINVAL;
 
        if (resource->driver && resource->driver->ops.prepare_update) {
@@ -593,13 +593,13 @@ syscommon_resman_monitor_get_resource_attrs_json(int resource_id, char **json_st
        struct syscommon_resman_resource *resource = find_resource(resource_id);
        int i;
 
-       if (!resource || !resource->type)
+       if (!resource || !resource->resource_type)
                return -EINVAL;
 
        jobj_root = json_object_new_object();
 
        jobj_res_name = json_object_new_string(resource->name);
-       jobj_res_type = json_object_new_int(resource->type);
+       jobj_res_type = json_object_new_int(resource->resource_type);
        jobj_res_attrs = json_object_new_array();
 
        for (i = 0; i < resource->num_attrs; i++) {
@@ -1117,7 +1117,7 @@ syscommon_resman_get_resource_type(int resource_id)
 {
        struct syscommon_resman_resource *resource = find_resource(resource_id);
 
-       return resource ? resource->type : -EINVAL;
+       return resource ? resource->resource_type : -EINVAL;
 }
 
 int