include: match naming with upstream Linux

Rename local variable 'cgroup' -> 'cgrp' to match upstream Linux Kernel,
across the files under include/libcgroup/ bringing it closer to the
Linux kernel cgroup code.

Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>

diff --git a/include/libcgroup/config.h b/include/libcgroup/config.h
index 73c784679e25a9fb9f0ae89035642b99ebb42278..515c3cf68c0d3bcc9e1676f42a14fbe993393f7e 100644 (file)
--- a/include/libcgroup/config.h
+++ b/include/libcgroup/config.h
@@ -100,8 +100,7 @@ int cgroup_load_templates_cache_from_files(int *file_index);
  * @param tmpl_files
  */
 struct cgroup_string_list;
-void cgroup_templates_cache_set_source_files(
-       struct cgroup_string_list *tmpl_files);
+void cgroup_templates_cache_set_source_files(struct cgroup_string_list *tmpl_files);
 
 /**
  * Physically create a new control group in kernel, based on given control
@@ -123,9 +122,7 @@ void cgroup_templates_cache_set_source_files(
  * @param template_name Template name used for cgroup setting
  * @param flags Bit flags to change the behavior
  */
-int cgroup_config_create_template_group(
-       struct cgroup *cgroup, char *template_name,
-       int flags);
+int cgroup_config_create_template_group(struct cgroup *cgrp, char *template_name, int flags);
 
 /**
  * @}

diff --git a/include/libcgroup/groups.h b/include/libcgroup/groups.h
index fb8159a1489d52f66a83dc31ab0b5967c6b1e9e8..538c0fee1f112f1623b949a43cc8538ea99b81d8 100644 (file)
--- a/include/libcgroup/groups.h
+++ b/include/libcgroup/groups.h
@@ -159,46 +159,44 @@ struct cgroup *cgroup_new_cgroup(const char *name);
  * Attach new controller to cgroup. This function just modifies internal
  * libcgroup structure, not the kernel control group.
  *
- * @param cgroup
+ * @param cgrp
  * @param name The name of the controller, e.g. "freezer".
  * @return Created controller or NULL on error.
  */
-struct cgroup_controller *cgroup_add_controller(struct cgroup *cgroup,
-                                               const char *name);
+struct cgroup_controller *cgroup_add_controller(struct cgroup *cgrp, const char *name);
 
 /**
  * Attach all mounted controllers to given cgroup. This function just modifies
  * internal libcgroup structure, not the kernel control group.
  *
- * @param cgroup
+ * @param cgrp
  * @return zero or error number
  */
-int cgroup_add_all_controllers(struct cgroup *cgroup);
+int cgroup_add_all_controllers(struct cgroup *cgrp);
 
 
 /**
  * Return appropriate controller from given group.
  * The controller must be added before using cgroup_add_controller() or loaded
  * from kernel using cgroup_get_cgroup().
- * @param cgroup
+ * @param cgrp
  * @param name The name of the controller, e.g. "freezer".
  */
-struct cgroup_controller *cgroup_get_controller(struct cgroup *cgroup,
-                                               const char *name);
+struct cgroup_controller *cgroup_get_controller(struct cgroup *cgrp, const char *name);
 
 /**
  * Free internal @c cgroup structure. This function frees also all controllers
  * attached to the @c cgroup, including all parameters and their values.
- * @param cgroup
+ * @param cgrp
  */
-void cgroup_free(struct cgroup **cgroup);
+void cgroup_free(struct cgroup **cgrp);
 
 /**
  * Free internal list of controllers from the group.
  * @todo should this function be public???
- * @param cgroup
+ * @param cgrp
  */
-void cgroup_free_controllers(struct cgroup *cgroup);
+void cgroup_free_controllers(struct cgroup *cgrp);
 
 /**
  * @}
@@ -216,14 +214,14 @@ void cgroup_free_controllers(struct cgroup *cgroup);
  * All parameters set by cgroup_add_value_* functions are written.
  * The created groups has owner which was set by cgroup_set_uid_gid() and
  * permissions set by cgroup_set_permissions.
- * @param cgroup
+ * @param cgrp
  * @param ignore_ownership When nozero, all errors are ignored when setting
  *     owner of the group and/or its tasks file.
  *     @todo what is ignore_ownership good for?
  * @retval #ECGROUPNOTEQUAL if not all specified controller parameters
  *      were successfully set.
  */
-int cgroup_create_cgroup(struct cgroup *cgroup, int ignore_ownership);
+int cgroup_create_cgroup(struct cgroup *cgrp, int ignore_ownership);
 
 /**
  * Physically create new control group in kernel, with all parameters and values
@@ -238,7 +236,7 @@ int cgroup_create_cgroup(struct cgroup *cgroup, int ignore_ownership);
  * cgroup_add_controller() is not used, like in cgroup_create_cgroup()? I can't
  * create subgroup of root group in just one hierarchy with this function!
  *
- * @param cgroup The cgroup to create. Only it's name is used, everything else
+ * @param cgrp The cgroup to create. Only it's name is used, everything else
  *     is discarded.
  * @param ignore_ownership When nozero, all errors are ignored when setting
  *     owner of the group and/or its tasks file.
@@ -246,17 +244,16 @@ int cgroup_create_cgroup(struct cgroup *cgroup, int ignore_ownership);
  * @retval #ECGROUPNOTEQUAL if not all inherited controller parameters
  *      were successfully set (this is expected).
  */
-int cgroup_create_cgroup_from_parent(struct cgroup *cgroup,
-                                    int ignore_ownership);
+int cgroup_create_cgroup_from_parent(struct cgroup *cgrp, int ignore_ownership);
 
 /**
  * Physically modify a control group in kernel. All parameters added by
  * cgroup_add_value_ or cgroup_set_value_ are written.
  * Currently it's not possible to change and owner of a group.
  *
- * @param cgroup
+ * @param cgrp
  */
-int cgroup_modify_cgroup(struct cgroup *cgroup);
+int cgroup_modify_cgroup(struct cgroup *cgrp);
 
 /**
  * Physically remove a control group from kernel. The group is removed from
@@ -267,12 +264,12 @@ int cgroup_modify_cgroup(struct cgroup *cgroup);
  * The group being removed must be empty, i.e. without subgroups. Use
  * cgroup_delete_cgroup_ext() for recursive delete.
  *
- * @param cgroup
+ * @param cgrp
  * @param ignore_migration When nozero, all errors are ignored when migrating
  *     tasks from the group to the parent group.
  *     @todo what is ignore_migration good for? rmdir() will fail if tasks were not moved.
  */
-int cgroup_delete_cgroup(struct cgroup *cgroup, int ignore_migration);
+int cgroup_delete_cgroup(struct cgroup *cgrp, int ignore_migration);
 
 /**
  * Physically remove a control group from kernel.
@@ -284,11 +281,11 @@ int cgroup_delete_cgroup(struct cgroup *cgroup, int ignore_migration);
  * are removed but the root group itself is left undeleted.
  * @see cgroup_delete_flag.
  *
- * @param cgroup
+ * @param cgrp
  * @param flags Combination of CGFLAG_DELETE_* flags, which indicate what and
  *     how to delete.
  */
-int cgroup_delete_cgroup_ext(struct cgroup *cgroup, int flags);
+int cgroup_delete_cgroup_ext(struct cgroup *cgrp, int flags);
 
 /**
  * @}
@@ -314,10 +311,10 @@ int cgroup_delete_cgroup_ext(struct cgroup *cgroup, int flags);
  * cgroup_get_uid_gid() if the group is in multiple hierarchies, each with
  * different owner of tasks file?
  *
- * @param cgroup The cgroup to load. Only it's name is used, everything else
+ * @param cgrp The cgroup to load. Only it's name is used, everything else
  *     is replaced.
  */
-int cgroup_get_cgroup(struct cgroup *cgroup);
+int cgroup_get_cgroup(struct cgroup *cgrp);
 
 /**
  * Copy all controllers, their parameters and values. Group name, permissions
@@ -332,15 +329,15 @@ int cgroup_copy_cgroup(struct cgroup *dst, struct cgroup *src);
 /**
  * Compare names, owners, controllers, parameters and values of two groups.
  *
- * @param cgroup_a
- * @param cgroup_b
+ * @param cgrp_a
+ * @param cgrp_b
  *
  * @retval 0  if the groups are the same.
  * @retval #ECGROUPNOTEQUAL if the groups are not the same.
  * @retval #ECGCONTROLLERNOTEQUAL if the only difference are controllers,
  *     parameters or their values.
  */
-int cgroup_compare_cgroup(struct cgroup *cgroup_a, struct cgroup *cgroup_b);
+int cgroup_compare_cgroup(struct cgroup *cgrp_a, struct cgroup *cgrp_b);
 
 
 /**
@@ -352,15 +349,14 @@ int cgroup_compare_cgroup(struct cgroup *cgroup_a, struct cgroup *cgroup_b);
  * @retval 0  if the controllers are the same.
  * @retval #ECGCONTROLLERNOTEQUAL if the controllers are not equal.
  */
-int cgroup_compare_controllers(struct cgroup_controller *cgca,
-                              struct cgroup_controller *cgcb);
+int cgroup_compare_controllers(struct cgroup_controller *cgca, struct cgroup_controller *cgcb);
 
 /**
  * Set owner of the group control files and the @c tasks file. This function
  * modifies only @c libcgroup internal @c cgroup structure, use
  * cgroup_create_cgroup() afterwards to create the group with given owners.
  *
- * @param cgroup
+ * @param cgrp
  * @param tasks_uid UID of the owner of group's @c tasks file.
  * @param tasks_gid GID of the owner of group's @c tasks file.
  * @param control_uid UID of the owner of group's control files (i.e.
@@ -368,7 +364,7 @@ int cgroup_compare_controllers(struct cgroup_controller *cgca,
  * @param control_gid GID of the owner of group's control files (i.e.
  *     parameters).
  */
-int cgroup_set_uid_gid(struct cgroup *cgroup, uid_t tasks_uid, gid_t tasks_gid,
+int cgroup_set_uid_gid(struct cgroup *cgrp, uid_t tasks_uid, gid_t tasks_gid,
                       uid_t control_uid, gid_t control_gid);
 
 /**
@@ -376,7 +372,7 @@ int cgroup_set_uid_gid(struct cgroup *cgroup, uid_t tasks_uid, gid_t tasks_gid,
  * The data is read from @c libcgroup internal @c cgroup structure, use
  * cgroup_set_uid_gid() or cgroup_get_cgroup() to fill it.
  */
-int cgroup_get_uid_gid(struct cgroup *cgroup, uid_t *tasks_uid,
+int cgroup_get_uid_gid(struct cgroup *cgrp, uid_t *tasks_uid,
                       gid_t *tasks_gid, uid_t *control_uid,
                       gid_t *control_gid);
 
@@ -387,12 +383,12 @@ int cgroup_get_uid_gid(struct cgroup *cgroup, uid_t *tasks_uid,
  * the given permissions are masked with the file owner's permissions.
  * For example if a control file has permissions 640 and control_fperm is
  * 471 the result will be 460.
- * @param cgroup
+ * @param cgrp
  * @param control_dperm Directory permission for the group.
  * @param control_fperm File permission for the control files.
  * @param task_fperm File permissions for task file.
  */
-void cgroup_set_permissions(struct cgroup *cgroup,
+void cgroup_set_permissions(struct cgroup *cgrp,
                            mode_t control_dperm, mode_t control_fperm,
                            mode_t task_fperm);
 
@@ -430,8 +426,7 @@ int cgroup_add_value_string(struct cgroup_controller *controller,
  * @param value
  *
  */
-int cgroup_add_value_int64(struct cgroup_controller *controller,
-                          const char *name, int64_t value);
+int cgroup_add_value_int64(struct cgroup_controller *controller, const char *name, int64_t value);
 
 /**
  * Add parameter and its value to internal @c libcgroup structures.
@@ -454,8 +449,7 @@ int cgroup_add_value_uint64(struct cgroup_controller *controller,
  * @param value
  *
  */
-int cgroup_add_value_bool(struct cgroup_controller *controller,
-                         const char *name, bool value);
+int cgroup_add_value_bool(struct cgroup_controller *controller, const char *name, bool value);
 
 /**
  * Read a parameter value from @c libcgroup internal structures.
@@ -472,8 +466,7 @@ int cgroup_add_value_bool(struct cgroup_controller *controller,
  * @param name The name of the parameter.
  * @param value
  */
-int cgroup_get_value_string(struct cgroup_controller *controller,
-                           const char *name, char **value);
+int cgroup_get_value_string(struct cgroup_controller *controller, const char *name, char **value);
 /**
  * Read a parameter value from @c libcgroup internal structures.
  * Use @c cgroup_get_cgroup() to fill these structures with data from kernel.
@@ -482,8 +475,7 @@ int cgroup_get_value_string(struct cgroup_controller *controller,
  * @param name The name of the parameter.
  * @param value
  */
-int cgroup_get_value_int64(struct cgroup_controller *controller,
-                          const char *name, int64_t *value);
+int cgroup_get_value_int64(struct cgroup_controller *controller, const char *name, int64_t *value);
 
 /**
  * Read a parameter value from @c libcgroup internal structures.
@@ -504,8 +496,7 @@ int cgroup_get_value_uint64(struct cgroup_controller *controller,
  * @param name The name of the parameter.
  * @param value
  */
-int cgroup_get_value_bool(struct cgroup_controller *controller,
-                         const char *name, bool *value);
+int cgroup_get_value_bool(struct cgroup_controller *controller, const char *name, bool *value);
 
 /**
  * Set a parameter value in @c libcgroup internal structures.
@@ -549,8 +540,7 @@ int cgroup_set_value_uint64(struct cgroup_controller *controller,
  * @param name The name of the parameter.
  * @param value
  */
-int cgroup_set_value_bool(struct cgroup_controller *controller,
-                         const char *name, bool value);
+int cgroup_set_value_bool(struct cgroup_controller *controller, const char *name, bool value);
 
 /**
  * Return the number of variables for the specified controller in @c libcgroup
@@ -601,20 +591,20 @@ int cgroup_get_threads(const char *name, const char *controller, pid_t **pids, i
 
 /**
  * Change permission of files and directories of given group
- * @param cgroup The cgroup which permissions should be changed
+ * @param cgrp The cgroup which permissions should be changed
  * @param dir_mode The permission mode of group directory
  * @param dirm_change Denotes whether the directory change should be done
  * @param file_mode The permission mode of group files
  * @param filem_change Denotes whether the directory change should be done
  */
-int cg_chmod_recursive(struct cgroup *cgroup, mode_t dir_mode,
+int cg_chmod_recursive(struct cgroup *cgrp, mode_t dir_mode,
                       int dirm_change, mode_t file_mode, int filem_change);
 
 /**
  *  Get the name of the cgroup from a given cgroup
- *  @param cgroup The cgroup whose name is needed
+ *  @param cgrp The cgroup whose name is needed
  */
-char *cgroup_get_cgroup_name(struct cgroup *cgroup);
+char *cgroup_get_cgroup_name(struct cgroup *cgrp);
 
 /*
  * Convert from one cgroup version to another version
@@ -628,9 +618,9 @@ char *cgroup_get_cgroup_name(struct cgroup *cgroup);
  *         ECGFAIL conversion failed
  *         ECGCONTROLLERNOTEQUAL incorrect controller version provided
  */
-int cgroup_convert_cgroup(struct cgroup * const out_cgroup,
+int cgroup_convert_cgroup(struct cgroup * const out_cgrp,
                          enum cg_version_t out_version,
-                         const struct cgroup * const in_cgroup,
+                         const struct cgroup * const in_cgrp,
                          enum cg_version_t in_version);
 
 /**
@@ -641,8 +631,7 @@ int cgroup_convert_cgroup(struct cgroup * const out_cgroup,
  *     @return 0 success and list of mounts paths in mount_paths
  *             ECGOTHER on failure and mount_paths is NULL.
  */
-int cgroup_list_mount_points(const enum cg_version_t cgrp_version,
-                            char ***mount_paths);
+int cgroup_list_mount_points(const enum cg_version_t cgrp_version, char ***mount_paths);
 
 /**
  * Get the cgroup version of a controller.  Version is set to CGROUP_UNK
@@ -651,8 +640,7 @@ int cgroup_list_mount_points(const enum cg_version_t cgrp_version,
  * @param controller The controller of interest
  * @param version The version of the controller
  */
-int cgroup_get_controller_version(const char * const controller,
-                                 enum cg_version_t * const version);
+int cgroup_get_controller_version(const char * const controller, enum cg_version_t * const version);
 
 /**
  * Get the current group setup mode (legacy/unified/hybrid)
@@ -665,18 +653,18 @@ enum cg_setup_mode_t cgroup_setup_mode(void);
  * Return the number of controllers for the specified cgroup in libcgroup
  * internal structures.
  *
- * @param cgroup
+ * @param cgrp
  * @return Count of the controllers or -1 on error.
  */
-int cgroup_get_controller_count(struct cgroup *cgroup);
+int cgroup_get_controller_count(struct cgroup *cgrp);
 
 /**
  * Return requested controller from given group
  *
- * @param cgroup
+ * @param cgrp
  * @param index The index into the cgroup controller list
  */
-struct cgroup_controller *cgroup_get_controller_by_index(struct cgroup *cgroup, int index);
+struct cgroup_controller *cgroup_get_controller_by_index(struct cgroup *cgrp, int index);
 
 /**
  * Given a controller pointer, get the name of the controller

diff --git a/include/libcgroup/iterators.h b/include/libcgroup/iterators.h
index 674ae0a409de63b908085d1db57b32b9a16696e8..e1dbcb99fb2041b5ae50489911cecb9482a0e12e 100644 (file)
--- a/include/libcgroup/iterators.h
+++ b/include/libcgroup/iterators.h
@@ -163,8 +163,7 @@ int cgroup_walk_tree_begin(const char *controller, const char *base_path, int de
  * @param base_level Value of base_level returned by cgroup_walk_tree_begin().
  * @return #ECGEOF when we are done walking through the nodes.
  */
-int cgroup_walk_tree_next(int depth, void **handle,
-                         struct cgroup_file_info *info, int base_level);
+int cgroup_walk_tree_next(int depth, void **handle, struct cgroup_file_info *info, int base_level);
 
 /**
  * Release the iterator.
@@ -275,14 +274,13 @@ int cgroup_read_stats_end(void **handle);
 
 /**
  * Read the tasks file to get the list of tasks in a cgroup.
- * @param cgroup Name of the cgroup.
+ * @param cgrp Name of the cgroup.
  * @param controller Name of the cgroup subsystem.
  * @param handle The handle to be used in the iteration.
  * @param pid The pid read from the tasks file.
  * @return #ECGEOF when the group does not contain any tasks.
  */
-int cgroup_get_task_begin(const char *cgroup, const char *controller, void **handle,
-                         pid_t *pid);
+int cgroup_get_task_begin(const char *cgrp, const char *controller, void **handle, pid_t *pid);
 
 /**
  * Read the next task value.
@@ -376,8 +374,7 @@ struct controller_data {
  * @param handle The handle to be used for iteration.
  * @param info The structure which will be filled with controller data.
  */
-int cgroup_get_all_controller_begin(void **handle,
-       struct controller_data *info);
+int cgroup_get_all_controller_begin(void **handle, struct controller_data *info);
 /**
  * Read next controllers from /proc/cgroups.
  * @param handle The handle to be used for iteration.
@@ -407,8 +404,7 @@ int cgroup_get_all_controller_end(void **handle);
  * @param path Buffer to fill the path into. The buffer must be at least
  * FILENAME_MAX characters long.
  */
-int cgroup_get_subsys_mount_point_begin(const char *controller, void **handle,
-                                       char *path);
+int cgroup_get_subsys_mount_point_begin(const char *controller, void **handle, char *path);
 
 /**
  * Read next mount point of the hierarchy with given controller.

diff --git a/include/libcgroup/systemd.h b/include/libcgroup/systemd.h
index e6c863a8c1060fc04c08449c8d44885ecf6fd62f..4f0fca4353de48fbb53d6f1b9b476a54350df201 100644 (file)
--- a/include/libcgroup/systemd.h
+++ b/include/libcgroup/systemd.h
@@ -68,7 +68,7 @@ int cgroup_create_scope(const char * const scope_name, const char * const slice_
 /**
  * Create a systemd scope
  *
- * @param cgroup
+ * @param cgrp
  * @param ignore_ownership When nonzero, all errors are ignored when setting owner of the group
  *     owner of the group and/or its tasks file
  * @param opts Scope creation options structure instance
@@ -77,7 +77,7 @@ int cgroup_create_scope(const char * const scope_name, const char * const slice_
  *
  * @note The cgroup->name field should be of the form "foo.slice/bar.scope"
  */
-int cgroup_create_scope2(struct cgroup *cgroup, int ignore_ownership,
+int cgroup_create_scope2(struct cgroup *cgrp, int ignore_ownership,
                         const struct cgroup_systemd_scope_opts * const opts);
 
 /**

diff --git a/include/libcgroup/tasks.h b/include/libcgroup/tasks.h
index b504bf523d0b06d8d22accaa1939e58894ba4a05..ea4063512eaf3922c54e5066687e06ae865280e7 100644 (file)
--- a/include/libcgroup/tasks.h
+++ b/include/libcgroup/tasks.h
@@ -47,16 +47,16 @@ enum cgroup_daemon_type {
 
 /**
  * Move current task (=thread) to given control group.
- * @param cgroup Destination control group.
+ * @param cgrp Destination control group.
  */
-int cgroup_attach_task(struct cgroup *cgroup);
+int cgroup_attach_task(struct cgroup *cgrp);
 
 /**
  * Move given task (=thread) to given control group.
- * @param cgroup Destination control group.
+ * @param cgrp Destination control group.
  * @param tid The task to move.
  */
-int cgroup_attach_task_pid(struct cgroup *cgroup, pid_t tid);
+int cgroup_attach_task_pid(struct cgroup *cgrp, pid_t tid);
 
 /**
  * Changes the cgroup of a task based on the path provided.  In this case,
@@ -69,8 +69,7 @@ int cgroup_attach_task_pid(struct cgroup *cgroup, pid_t tid);
  *
  * @todo should this function be really public?
  */
-int cgroup_change_cgroup_path(const char *path, pid_t pid,
-                             const char * const controllers[]);
+int cgroup_change_cgroup_path(const char *path, pid_t pid, const char * const controllers[]);
 
 /**
  * Get the current control group path where the given task is.
@@ -80,8 +79,7 @@ int cgroup_change_cgroup_path(const char *path, pid_t pid,
  *     The patch is relative to the root of the hierarchy. The caller must
  *     free this memory.
  */
-int cgroup_get_current_controller_path(pid_t pid, const char *controller,
-                                      char **current_path);
+int cgroup_get_current_controller_path(pid_t pid, const char *controller, char **current_path);
 
 /**
  * @}
@@ -153,8 +151,7 @@ int cgroup_change_all_cgroups(void);
  * @param flags Bit flags to change the behavior, as defined in enum #cgflags.
  * @todo Determine thread-safeness and fix of not safe.
  */
-int cgroup_change_cgroup_flags(uid_t uid, gid_t gid,
-                              const char *procname, pid_t pid, int flags);
+int cgroup_change_cgroup_flags(uid_t uid, gid_t gid, const char *procname, pid_t pid, int flags);
 
 /**
  * Changes the cgroup of a program based on the rules in the config file.  If a
@@ -169,8 +166,7 @@ int cgroup_change_cgroup_flags(uid_t uid, gid_t gid,
  * @param flags Bit flags to change the behavior, as defined in enum #cgflags.
  * @todo Determine thread-safeness and fix if not safe.
  */
-int cgroup_change_cgroup_uid_gid_flags(uid_t uid, gid_t gid,
-                                      pid_t pid, int flags);
+int cgroup_change_cgroup_uid_gid_flags(uid_t uid, gid_t gid, pid_t pid, int flags);
 
 /**
  * Provides backwards-compatibility with older versions of the API.  This

diff --git a/include/libcgroup/tools.h b/include/libcgroup/tools.h
index 9fcbb151f7c8e9eb8261a2567440f98f2f421896..ad25193183ff3dc97c8e3a1b1b9c09a9d6f53bf1 100644 (file)
--- a/include/libcgroup/tools.h
+++ b/include/libcgroup/tools.h
@@ -30,7 +30,7 @@ extern "C" {
  * requested version.  If successful, cg will be populated with
  * the setting-value pairs.
  *
- * @param cg Input/Output cgroup. Must be initialized and freed by the caller
+ * @param cgrp Input/Output cgroup. Must be initialized and freed by the caller
  * @param version Cgroup version of cg  If set to CGROUP_UNK, the versions
  *               stored within each controller will be used.  Otherwise this
  *               value will be used to override the cg param's controller
@@ -38,20 +38,19 @@ extern "C" {
  * @param ignore_unmappable Ignore failures due to settings that cannot be
  *                         converted from one cgroup version to another
  */
-int cgroup_cgxget(struct cgroup **cg,
-                 enum cg_version_t version, bool ignore_unmappable);
+int cgroup_cgxget(struct cgroup **cgrp, enum cg_version_t version, bool ignore_unmappable);
 
 /**
  * Write the setting-value pairs in *cg to the cgroup sysfs.
  * cgroup_cgxset() will perform the necessary conversions to match the
  * "on-disk" format prior to writing to the cgroup sysfs.
  *
- * @param cg cgroup instance that will be written to the cgroup sysfs
- * @param version Cgroup version of *cg
+ * @param cgrp cgroup instance that will be written to the cgroup sysfs
+ * @param version Cgroup version of *cgrp
  * @param ignore_unmappable Ignore failures due to settings that cannot be
  *                          converted from one cgroup version to another
  */
-int cgroup_cgxset(const struct cgroup * const cg,
+int cgroup_cgxset(const struct cgroup * const cgrp,
                  enum cg_version_t version, bool ignore_unmappable);
 
 #ifdef __cplusplus