Skip to content

Commit

Permalink
commands: port misnamed functions to general style
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
  • Loading branch information
Christian Brauner committed Feb 26, 2021
1 parent 0514b77 commit 6b6d770
Showing 1 changed file with 23 additions and 23 deletions.
46 changes: 23 additions & 23 deletions src/lxc/commands.c
Expand Up @@ -812,9 +812,10 @@ static int lxc_cmd_get_clone_flags_callback(int fd, struct lxc_cmd_req *req,
return lxc_cmd_rsp_send_reap(fd, &rsp);
}

static char *lxc_cmd_get_cgroup_path_do(const char *name, const char *lxcpath,
const char *controller,
lxc_cmd_t command)
static char *lxc_cmd_get_cgroup_path_callback(const char *name,
const char *lxcpath,
const char *controller,
lxc_cmd_t command)
{
bool stopped = false;
ssize_t ret;
Expand All @@ -837,9 +838,9 @@ static char *lxc_cmd_get_cgroup_path_do(const char *name, const char *lxcpath,
* it sees an unknown command and just closes the
* socket, sending us an EOF.
*/
return lxc_cmd_get_cgroup_path_do(name, lxcpath,
controller,
LXC_CMD_GET_CGROUP);
return lxc_cmd_get_cgroup_path_callback(name, lxcpath,
controller,
LXC_CMD_GET_CGROUP);
}
return NULL;
}
Expand All @@ -865,8 +866,8 @@ static char *lxc_cmd_get_cgroup_path_do(const char *name, const char *lxcpath,
char *lxc_cmd_get_cgroup_path(const char *name, const char *lxcpath,
const char *controller)
{
return lxc_cmd_get_cgroup_path_do(name, lxcpath, controller,
LXC_CMD_GET_CGROUP);
return lxc_cmd_get_cgroup_path_callback(name, lxcpath, controller,
LXC_CMD_GET_CGROUP);
}

/*
Expand All @@ -886,14 +887,14 @@ char *lxc_cmd_get_cgroup_path(const char *name, const char *lxcpath,
char *lxc_cmd_get_limit_cgroup_path(const char *name, const char *lxcpath,
const char *controller)
{
return lxc_cmd_get_cgroup_path_do(name, lxcpath, controller,
LXC_CMD_GET_LIMIT_CGROUP);
return lxc_cmd_get_cgroup_path_callback(name, lxcpath, controller,
LXC_CMD_GET_LIMIT_CGROUP);
}

static int lxc_cmd_get_cgroup_callback_do(int fd, struct lxc_cmd_req *req,
struct lxc_handler *handler,
struct lxc_epoll_descr *descr,
bool limiting_cgroup)
static int __lxc_cmd_get_cgroup_callback(int fd, struct lxc_cmd_req *req,
struct lxc_handler *handler,
struct lxc_epoll_descr *descr,
bool limiting_cgroup)
{
ssize_t ret;
const char *path;
Expand Down Expand Up @@ -930,14 +931,14 @@ static int lxc_cmd_get_cgroup_callback(int fd, struct lxc_cmd_req *req,
struct lxc_handler *handler,
struct lxc_epoll_descr *descr)
{
return lxc_cmd_get_cgroup_callback_do(fd, req, handler, descr, false);
return __lxc_cmd_get_cgroup_callback(fd, req, handler, descr, false);
}

static int lxc_cmd_get_limit_cgroup_callback(int fd, struct lxc_cmd_req *req,
struct lxc_handler *handler,
struct lxc_epoll_descr *descr)
{
return ret_errno(ENOSYS);
return __lxc_cmd_get_cgroup_callback(fd, req, handler, descr, true);
}

/*
Expand Down Expand Up @@ -1767,10 +1768,10 @@ int lxc_cmd_get_limit_cgroup2_fd(const char *name, const char *lxcpath)
return PTR_TO_INT(cmd.rsp.data);
}

static int lxc_cmd_get_cgroup2_fd_callback_do(int fd, struct lxc_cmd_req *req,
struct lxc_handler *handler,
struct lxc_epoll_descr *descr,
bool limiting_cgroup)
static int __lxc_cmd_get_cgroup2_fd_callback(int fd, struct lxc_cmd_req *req,
struct lxc_handler *handler,
struct lxc_epoll_descr *descr,
bool limiting_cgroup)
{
struct lxc_cmd_rsp rsp = {
.ret = -EINVAL,
Expand All @@ -1797,15 +1798,14 @@ static int lxc_cmd_get_cgroup2_fd_callback(int fd, struct lxc_cmd_req *req,
struct lxc_handler *handler,
struct lxc_epoll_descr *descr)
{
return lxc_cmd_get_cgroup2_fd_callback_do(fd, req, handler, descr,
false);
return __lxc_cmd_get_cgroup2_fd_callback(fd, req, handler, descr, false);
}

static int lxc_cmd_get_limit_cgroup2_fd_callback(int fd, struct lxc_cmd_req *req,
struct lxc_handler *handler,
struct lxc_epoll_descr *descr)
{
return ret_errno(ENOSYS);
return __lxc_cmd_get_cgroup2_fd_callback(fd, req, handler, descr, true);
}

static int lxc_cmd_rsp_send_enosys(int fd, int id)
Expand Down

0 comments on commit 6b6d770

Please sign in to comment.