diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2010-05-27 17:27:56 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2010-05-27 17:27:56 +0200 |
| commit | 87d55ff672d78ebf8afc755e88beeeb1bdf3ac5e (patch) | |
| tree | 9c097f79d65fff51fc8e63203f6212f9b7f06dc2 /libudev | |
| parent | 88cbfb09ee5510277503ff1830ecc3aa6c380b00 (diff) | |
childs -> children
Diffstat (limited to 'libudev')
| -rw-r--r-- | libudev/libudev-ctrl.c | 11 | ||||
| -rw-r--r-- | libudev/libudev-private.h | 4 | ||||
| -rw-r--r-- | libudev/libudev-util-private.c | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/libudev/libudev-ctrl.c b/libudev/libudev-ctrl.c index e47b2b66dc..af59c36826 100644 --- a/libudev/libudev-ctrl.c +++ b/libudev/libudev-ctrl.c @@ -32,8 +32,7 @@ enum udev_ctrl_msg_type { UDEV_CTRL_START_EXEC_QUEUE, UDEV_CTRL_RELOAD_RULES, UDEV_CTRL_SET_ENV, - UDEV_CTRL_SET_MAX_CHILDS, - UDEV_CTRL_SET_MAX_CHILDS_RUNNING, + UDEV_CTRL_SET_CHILDREN_MAX, UDEV_CTRL_SETTLE, }; @@ -185,9 +184,9 @@ int udev_ctrl_send_set_env(struct udev_ctrl *uctrl, const char *key) return ctrl_send(uctrl, UDEV_CTRL_SET_ENV, 0, key); } -int udev_ctrl_send_set_max_childs(struct udev_ctrl *uctrl, int count) +int udev_ctrl_send_set_children_max(struct udev_ctrl *uctrl, int count) { - return ctrl_send(uctrl, UDEV_CTRL_SET_MAX_CHILDS, count, NULL); + return ctrl_send(uctrl, UDEV_CTRL_SET_CHILDREN_MAX, count, NULL); } int udev_ctrl_send_settle(struct udev_ctrl *uctrl) @@ -306,9 +305,9 @@ const char *udev_ctrl_get_set_env(struct udev_ctrl_msg *ctrl_msg) return NULL; } -int udev_ctrl_get_set_max_childs(struct udev_ctrl_msg *ctrl_msg) +int udev_ctrl_get_set_children_max(struct udev_ctrl_msg *ctrl_msg) { - if (ctrl_msg->ctrl_msg_wire.type == UDEV_CTRL_SET_MAX_CHILDS) + if (ctrl_msg->ctrl_msg_wire.type == UDEV_CTRL_SET_CHILDREN_MAX) return ctrl_msg->ctrl_msg_wire.intval; return -1; } diff --git a/libudev/libudev-private.h b/libudev/libudev-private.h index fa9722360b..fa408f6ae6 100644 --- a/libudev/libudev-private.h +++ b/libudev/libudev-private.h @@ -127,7 +127,7 @@ int udev_ctrl_send_start_exec_queue(struct udev_ctrl *uctrl); int udev_ctrl_send_reload_rules(struct udev_ctrl *uctrl); int udev_ctrl_send_settle(struct udev_ctrl *uctrl); int udev_ctrl_send_set_env(struct udev_ctrl *uctrl, const char *key); -int udev_ctrl_send_set_max_childs(struct udev_ctrl *uctrl, int count); +int udev_ctrl_send_set_children_max(struct udev_ctrl *uctrl, int count); struct udev_ctrl_msg; struct udev_ctrl_msg *udev_ctrl_msg(struct udev_ctrl *uctrl); struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl *uctrl); @@ -139,7 +139,7 @@ int udev_ctrl_get_start_exec_queue(struct udev_ctrl_msg *ctrl_msg); int udev_ctrl_get_reload_rules(struct udev_ctrl_msg *ctrl_msg); pid_t udev_ctrl_get_settle(struct udev_ctrl_msg *ctrl_msg); const char *udev_ctrl_get_set_env(struct udev_ctrl_msg *ctrl_msg); -int udev_ctrl_get_set_max_childs(struct udev_ctrl_msg *ctrl_msg); +int udev_ctrl_get_set_children_max(struct udev_ctrl_msg *ctrl_msg); /* libudev-list.c */ struct udev_list_node { diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c index 7d28b23b38..2f9f4a74c3 100644 --- a/libudev/libudev-util-private.c +++ b/libudev/libudev-util-private.c @@ -454,7 +454,7 @@ int util_run_program(struct udev *udev, const char *command, char **envp, if (errpipe[READ_END] > 0) close(errpipe[READ_END]); - /* return the childs stdout string */ + /* return the child's stdout string */ if (result) { result[respos] = '\0'; dbg(udev, "result='%s'\n", result); |