From cd5f5455f23b3a072018a738f24b67aedc008a45 Mon Sep 17 00:00:00 2001
From: David Bigagli <david@schedmd.com>
Date: Fri, 19 Jul 2013 11:59:38 -0700
Subject: [PATCH] Fix recurring typo.
---
slurm/slurmdb.h | 2 +-
src/common/assoc_mgr.c | 44 +++++++++----------
src/common/assoc_mgr.h | 2 +-
src/common/forward.c | 4 +-
src/common/forward.h | 4 +-
src/common/slurm_protocol_api.c | 10 ++---
src/common/slurm_protocol_api.h | 12 ++---
src/common/slurmdb_defs.c | 28 ++++++------
.../multifactor/priority_multifactor.c | 24 +++++-----
src/sacctmgr/file_functions.c | 16 +++----
src/sview/common.c | 2 +-
src/sview/sview.c | 14 +++---
testsuite/expect/test24.1.prog.c | 2 +-
13 files changed, 82 insertions(+), 82 deletions(-)
diff --git a/slurm/slurmdb.h b/slurm/slurmdb.h
index 43fd35d7802..b0ac7402c7b 100644
--- a/slurm/slurmdb.h
+++ b/slurm/slurmdb.h
@@ -840,7 +840,7 @@ typedef struct {
typedef struct {
slurmdb_association_rec_t *assoc;
char *sort_name;
- List childern;
+ List children;
} slurmdb_hierarchical_rec_t;
/************** report specific structures **************/
diff --git a/src/common/assoc_mgr.c b/src/common/assoc_mgr.c
index 5850cc4dc89..8e4f3f7f319 100644
--- a/src/common/assoc_mgr.c
+++ b/src/common/assoc_mgr.c
@@ -434,12 +434,12 @@ static int _set_assoc_parent_and_user(slurmdb_association_rec_t *assoc,
assoc->usage->parent_assoc_ptr->usage =
create_assoc_mgr_association_usage();
if (!assoc->usage->
- parent_assoc_ptr->usage->childern_list)
+ parent_assoc_ptr->usage->children_list)
assoc->usage->
- parent_assoc_ptr->usage->childern_list =
+ parent_assoc_ptr->usage->children_list =
list_create(NULL);
list_append(assoc->usage->
- parent_assoc_ptr->usage->childern_list,
+ parent_assoc_ptr->usage->children_list,
assoc);
}
@@ -549,11 +549,11 @@ static int _post_association_list(List assoc_list)
list_iterator_reset(itr);
while ((assoc = list_next(itr))) {
int count = 0;
- if (!assoc->usage->childern_list
- || !list_count(assoc->usage->childern_list))
+ if (!assoc->usage->children_list
+ || !list_count(assoc->usage->children_list))
continue;
itr2 = list_iterator_create(
- assoc->usage->childern_list);
+ assoc->usage->children_list);
while ((assoc2 = list_next(itr2))) {
if (assoc2->shares_raw != SLURMDB_FS_USE_PARENT)
count += assoc2->shares_raw;
@@ -1267,8 +1267,8 @@ extern void destroy_assoc_mgr_association_usage(void *object)
(assoc_mgr_association_usage_t *)object;
if (usage) {
- if (usage->childern_list)
- list_destroy(usage->childern_list);
+ if (usage->children_list)
+ list_destroy(usage->children_list);
FREE_NULL_BITMAP(usage->valid_qos);
xfree(usage);
@@ -1553,8 +1553,8 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn,
is really in existance here, if they really want it they can
use the pointer that is returned. */
- /* if (!assoc->usage->childern_list) */
- /* assoc->usage->childern_list = ret_assoc->usage->childern_list; */
+ /* if (!assoc->usage->children_list) */
+ /* assoc->usage->children_list = ret_assoc->usage->children_list; */
/* assoc->usage->grp_used_cpus = ret_assoc->usage->grp_used_cpus; */
/* assoc->usage->grp_used_cpu_run_mins = */
/* ret_assoc->usage->grp_used_cpu_run_mins; */
@@ -2513,7 +2513,7 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
if (setup_children)
parents_changed = 1; /* set since we need to
set the shares
- of surrounding childern
+ of surrounding children
*/
if (remove_assoc_notify) {
/* since there are some deadlock
@@ -2551,12 +2551,12 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
assoc_mgr_association_list);
list_iterator_reset(itr);
- /* flush the childern lists */
+ /* flush the children lists */
if (setup_children) {
while ((object = list_next(itr))) {
- if (object->usage->childern_list)
+ if (object->usage->children_list)
list_flush(object->usage->
- childern_list);
+ children_list);
}
list_iterator_reset(itr);
}
@@ -2581,11 +2581,11 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
if (setup_children) {
int count = 0;
ListIterator itr2 = NULL;
- if (!object->usage->childern_list ||
- !list_count(object->usage->childern_list))
+ if (!object->usage->children_list ||
+ !list_count(object->usage->children_list))
goto is_user;
itr2 = list_iterator_create(
- object->usage->childern_list);
+ object->usage->children_list);
while ((rec = list_next(itr2))) {
if (rec->shares_raw
!= SLURMDB_FS_USE_PARENT)
@@ -3260,22 +3260,22 @@ extern void assoc_mgr_clear_used_info(void)
assoc_mgr_unlock(&locks);
}
-static void _reset_children_usages(List childern_list)
+static void _reset_children_usages(List children_list)
{
slurmdb_association_rec_t *assoc = NULL;
ListIterator itr = NULL;
- if (!childern_list || !list_count(childern_list))
+ if (!children_list || !list_count(children_list))
return;
- itr = list_iterator_create(childern_list);
+ itr = list_iterator_create(children_list);
while ((assoc = list_next(itr))) {
assoc->usage->usage_raw = 0.0;
assoc->usage->grp_used_wall = 0.0;
if (assoc->user)
continue;
- _reset_children_usages(assoc->usage->childern_list);
+ _reset_children_usages(assoc->usage->children_list);
}
list_iterator_destroy(itr);
}
@@ -3322,7 +3322,7 @@ extern void assoc_mgr_remove_assoc_usage(slurmdb_association_rec_t *assoc)
/*
* The assoc is an account, so reset all children
*/
- _reset_children_usages(sav_assoc->usage->childern_list);
+ _reset_children_usages(sav_assoc->usage->children_list);
}
extern int dump_assoc_mgr_state(char *state_save_location)
diff --git a/src/common/assoc_mgr.h b/src/common/assoc_mgr.h
index 2c80a6367cb..d5a39aff357 100644
--- a/src/common/assoc_mgr.h
+++ b/src/common/assoc_mgr.h
@@ -98,7 +98,7 @@ typedef struct {
} assoc_init_args_t;
struct assoc_mgr_association_usage {
- List childern_list; /* list of childern associations
+ List children_list; /* list of children associations
* (DON'T PACK) */
uint32_t grp_used_cpus; /* count of active jobs in the group
diff --git a/src/common/forward.c b/src/common/forward.c
index 49046f0e810..0b225b110f4 100644
--- a/src/common/forward.c
+++ b/src/common/forward.c
@@ -460,7 +460,7 @@ extern void forward_init(forward_t *forward, forward_t *from)
*
* IN: forward_struct - forward_struct_t * - holds information about message
* that needs to be forwarded to
- * childern processes
+ * children processes
* IN: header - header_t - header from message that came in
* needing to be forwarded.
* RET: SLURM_SUCCESS - int
@@ -559,7 +559,7 @@ extern int forward_msg(forward_struct_t *forward_struct,
* IN: hl - hostlist_t - list of every node to send message to
* IN: msg - slurm_msg_t - message to send.
* IN: timeout - int - how long to wait in milliseconds.
- * RET List - List containing the responses of the childern
+ * RET List - List containing the responses of the children
* (if any) we forwarded the message to. List
* containing type (ret_data_info_t).
*/
diff --git a/src/common/forward.h b/src/common/forward.h
index 6d7689ed6c0..115e43e893c 100644
--- a/src/common/forward.h
+++ b/src/common/forward.h
@@ -60,7 +60,7 @@ extern void forward_init(forward_t *forward, forward_t *from);
*
* IN: forward_struct - forward_struct_t * - holds information about message
* that needs to be forwarded to
- * childern processes
+ * children processes
* IN: header - header_t - header from message that came in
* needing to be forwarded.
* RET: SLURM_SUCCESS - int
@@ -97,7 +97,7 @@ extern int forward_msg(forward_struct_t *forward_struct,
* IN: hl - hostlist_t - list of every node to send message to
* IN: msg - slurm_msg_t - message to send.
* IN: timeout - int - how long to wait in milliseconds.
- * RET List - List containing the responses of the childern
+ * RET List - List containing the responses of the children
* (if any) we forwarded the message to. List
* containing type (ret_data_info_t).
*/
diff --git a/src/common/slurm_protocol_api.c b/src/common/slurm_protocol_api.c
index 96a2995a8e0..844c8ac7836 100644
--- a/src/common/slurm_protocol_api.c
+++ b/src/common/slurm_protocol_api.c
@@ -2473,7 +2473,7 @@ total_return:
* IN open_fd - file descriptor to receive msg on
* IN steps - how many steps down the tree we have to wait for
* IN timeout - how long to wait in milliseconds
- * RET List - List containing the responses of the childern (if any) we
+ * RET List - List containing the responses of the children (if any) we
* forwarded the message to. List containing type
* (ret_data_info_t).
*/
@@ -3368,7 +3368,7 @@ _send_and_recv_msg(slurm_fd_t fd, slurm_msg_t *req,
* IN fd - file descriptor to receive msg on
* IN req - a slurm_msg struct to be sent by the function
* IN timeout - how long to wait in milliseconds
- * RET List - List containing the responses of the childern (if any) we
+ * RET List - List containing the responses of the children (if any) we
* forwarded the message to. List containing type
* (ret_data_info_t).
*/
@@ -3387,7 +3387,7 @@ _send_and_recv_msgs(slurm_fd_t fd, slurm_msg_t *req, int timeout)
if (slurm_send_node_msg(fd, req) >= 0) {
if (req->forward.cnt > 0) {
/* figure out where we are in the tree and set
- * the timeout for to wait for our childern
+ * the timeout for to wait for our children
* correctly
* (timeout+message_timeout sec per step)
* to let the child timeout */
@@ -3602,7 +3602,7 @@ int slurm_send_only_node_msg(slurm_msg_t *req)
* IN msg - a slurm_msg struct to be sent by the function
* IN timeout - how long to wait in milliseconds
* IN quiet - if set, reduce logging details
- * RET List - List containing the responses of the childern
+ * RET List - List containing the responses of the children
* (if any) we forwarded the message to. List
* containing type (ret_data_info_t).
*/
@@ -3634,7 +3634,7 @@ List slurm_send_recv_msgs(const char *nodelist, slurm_msg_t *msg,
* Then return List containing type (ret_data_info_t).
* IN msg - a slurm_msg struct to be sent by the function
* IN timeout - how long to wait in milliseconds
- * RET List - List containing the responses of the childern
+ * RET List - List containing the responses of the children
* (if any) we forwarded the message to. List
* containing type (ret_types_t).
*/
diff --git a/src/common/slurm_protocol_api.h b/src/common/slurm_protocol_api.h
index e92be23456d..3e017193394 100644
--- a/src/common/slurm_protocol_api.h
+++ b/src/common/slurm_protocol_api.h
@@ -770,7 +770,7 @@ int slurm_receive_msg(slurm_fd_t fd, slurm_msg_t *msg, int timeout);
* IN open_fd - file descriptor to receive msg on
* IN steps - how many steps down the tree we have to wait for
* IN timeout - how long to wait in milliseconds
- * RET List - List containing the responses of the childern (if any) we
+ * RET List - List containing the responses of the children (if any) we
* forwarded the message to. List containing type
* (ret_data_info_t). NULL is returned on failure. and
* errno set.
@@ -783,8 +783,8 @@ List slurm_receive_msgs(slurm_fd_t fd, int steps, int timeout);
* forward the message to the nodes contained in the forward_t
* structure inside the header of the message. If timeout is
* zero, a default timeout is used. The 'resp' is the actual message
- * received and contains the ret_list of it's childern and the
- * forward_structure_t containing information about it's childern
+ * received and contains the ret_list of it's children and the
+ * forward_structure_t containing information about it's children
* also. Memory is allocated for the returned msg and the returned
* list both must be freed at some point using the
* slurm_free_functions and list_destroy function.
@@ -1085,7 +1085,7 @@ int slurm_send_recv_node_msg(slurm_msg_t * request_msg,
* IN msg - a slurm_msg struct to be sent by the function
* IN timeout - how long to wait in milliseconds
* IN quiet - if set, reduce logging details
- * RET List - List containing the responses of the childern
+ * RET List - List containing the responses of the children
* (if any) we forwarded the message to. List
* containing type (ret_types_t).
*/
@@ -1098,7 +1098,7 @@ List slurm_send_recv_msgs(const char *nodelist, slurm_msg_t *msg, int timeout,
* IN msg - a slurm_msg struct to be sent by the function
* IN name - the name of the node the message is being sent to
* IN timeout - how long to wait in milliseconds
- * RET List - List containing the responses of the childern
+ * RET List - List containing the responses of the children
* (if any) we forwarded the message to. List
* containing type (ret_types_t).
*/
@@ -1175,7 +1175,7 @@ extern int slurm_job_step_create (
* IN data: real data
* RET: error code
*/
-extern int slurm_forward_data(char *nodelist, char *address, uint32_t len,
+extern int slurm_forward_data(char *nodelist, char *address, uint32_t len,
char *data);
#endif
diff --git a/src/common/slurmdb_defs.c b/src/common/slurmdb_defs.c
index 238456bbe53..4063af95a30 100644
--- a/src/common/slurmdb_defs.c
+++ b/src/common/slurmdb_defs.c
@@ -113,7 +113,7 @@ static void _free_cluster_cond_members(slurmdb_cluster_cond_t *cluster_cond)
}
/*
- * Comparator used for sorting immediate childern of acct_hierarchical_recs
+ * Comparator used for sorting immediate children of acct_hierarchical_recs
*
* returns: -1 assoc_a < assoc_b 0: assoc_a == assoc_b 1: assoc_a > assoc_b
*
@@ -153,7 +153,7 @@ static int _sort_children_list(void *v1, void *v2)
}
/*
- * Comparator used for sorting immediate childern of acct_hierarchical_recs
+ * Comparator used for sorting immediate children of acct_hierarchical_recs
*
* returns: -1 assoc_a < assoc_b 0: assoc_a == assoc_b 1: assoc_a > assoc_b
*
@@ -187,16 +187,16 @@ static int _sort_slurmdb_hierarchical_rec_list(
itr = list_iterator_create(slurmdb_hierarchical_rec_list);
while((slurmdb_hierarchical_rec = list_next(itr))) {
- if (list_count(slurmdb_hierarchical_rec->childern))
+ if (list_count(slurmdb_hierarchical_rec->children))
_sort_slurmdb_hierarchical_rec_list(
- slurmdb_hierarchical_rec->childern);
+ slurmdb_hierarchical_rec->children);
}
list_iterator_destroy(itr);
return SLURM_SUCCESS;
}
-static int _append_hierarchical_childern_ret_list(
+static int _append_hierarchical_children_ret_list(
List ret_list, List slurmdb_hierarchical_rec_list)
{
slurmdb_hierarchical_rec_t *slurmdb_hierarchical_rec = NULL;
@@ -212,9 +212,9 @@ static int _append_hierarchical_childern_ret_list(
while((slurmdb_hierarchical_rec = list_next(itr))) {
list_append(ret_list, slurmdb_hierarchical_rec->assoc);
- if (list_count(slurmdb_hierarchical_rec->childern))
- _append_hierarchical_childern_ret_list(
- ret_list, slurmdb_hierarchical_rec->childern);
+ if (list_count(slurmdb_hierarchical_rec->children))
+ _append_hierarchical_children_ret_list(
+ ret_list, slurmdb_hierarchical_rec->children);
}
list_iterator_destroy(itr);
@@ -910,8 +910,8 @@ extern void slurmdb_destroy_hierarchical_rec(void *object)
slurmdb_hierarchical_rec_t *slurmdb_hierarchical_rec =
(slurmdb_hierarchical_rec_t *)object;
if (slurmdb_hierarchical_rec) {
- if (slurmdb_hierarchical_rec->childern) {
- list_destroy(slurmdb_hierarchical_rec->childern);
+ if (slurmdb_hierarchical_rec->children) {
+ list_destroy(slurmdb_hierarchical_rec->children);
}
xfree(slurmdb_hierarchical_rec);
}
@@ -1315,7 +1315,7 @@ extern List slurmdb_get_hierarchical_sorted_assoc_list(List assoc_list)
slurmdb_get_acct_hierarchical_rec_list(assoc_list);
List ret_list = list_create(NULL);
- _append_hierarchical_childern_ret_list(ret_list,
+ _append_hierarchical_children_ret_list(ret_list,
slurmdb_hierarchical_rec_list);
list_destroy(slurmdb_hierarchical_rec_list);
@@ -1333,7 +1333,7 @@ extern void slurmdb_sort_hierarchical_assoc_list(List assoc_list)
while(list_pop(assoc_list)) {
}
- _append_hierarchical_childern_ret_list(assoc_list,
+ _append_hierarchical_children_ret_list(assoc_list,
slurmdb_hierarchical_rec_list);
list_destroy(slurmdb_hierarchical_rec_list);
}
@@ -1358,7 +1358,7 @@ extern List slurmdb_get_acct_hierarchical_rec_list(List assoc_list)
while((assoc = list_next(itr))) {
arch_rec = xmalloc(sizeof(slurmdb_hierarchical_rec_t));
- arch_rec->childern =
+ arch_rec->children =
list_create(slurmdb_destroy_hierarchical_rec);
arch_rec->assoc = assoc;
@@ -1413,7 +1413,7 @@ extern List slurmdb_get_acct_hierarchical_rec_list(List assoc_list)
list_append(arch_rec_list, arch_rec);
last_parent = last_acct_parent = arch_rec;
} else
- list_append(par_arch_rec->childern, arch_rec);
+ list_append(par_arch_rec->children, arch_rec);
list_append(total_assoc_list, arch_rec);
}
diff --git a/src/plugins/priority/multifactor/priority_multifactor.c b/src/plugins/priority/multifactor/priority_multifactor.c
index f6062950576..b18c4039bb2 100644
--- a/src/plugins/priority/multifactor/priority_multifactor.c
+++ b/src/plugins/priority/multifactor/priority_multifactor.c
@@ -412,7 +412,7 @@ static void _set_usage_efctv(slurmdb_association_rec_t *assoc)
}
-/* This should initially get the childern list from
+/* This should initially get the children list from
* assoc_mgr_root_assoc. Since our algorythm goes from top down we
* calculate all the non-user associations now. When a user submits a
* job, that norm_fairshare is calculated. Here we will set the
@@ -421,22 +421,22 @@ static void _set_usage_efctv(slurmdb_association_rec_t *assoc)
*
* NOTE: acct_mgr_association_lock must be locked before this is called.
*/
-static int _set_children_usage_efctv(List childern_list)
+static int _set_children_usage_efctv(List children_list)
{
slurmdb_association_rec_t *assoc = NULL;
ListIterator itr = NULL;
- if (!childern_list || !list_count(childern_list))
+ if (!children_list || !list_count(children_list))
return SLURM_SUCCESS;
- itr = list_iterator_create(childern_list);
+ itr = list_iterator_create(children_list);
while ((assoc = list_next(itr))) {
if (assoc->user) {
assoc->usage->usage_efctv = (long double)NO_VAL;
continue;
}
priority_p_set_assoc_usage(assoc);
- _set_children_usage_efctv(assoc->usage->childern_list);
+ _set_children_usage_efctv(assoc->usage->children_list);
}
list_iterator_destroy(itr);
return SLURM_SUCCESS;
@@ -447,16 +447,16 @@ static int _set_children_usage_efctv(List childern_list)
*
* NOTE: acct_mgr_association_lock must be locked before this is called.
*/
-static int _distribute_tickets(List childern_list, uint32_t tickets)
+static int _distribute_tickets(List children_list, uint32_t tickets)
{
ListIterator itr;
slurmdb_association_rec_t *assoc;
double sfsum = 0, fs;
- if (!childern_list || !list_count(childern_list))
+ if (!children_list || !list_count(children_list))
return SLURM_SUCCESS;
- itr = list_iterator_create(childern_list);
+ itr = list_iterator_create(children_list);
while ((assoc = list_next(itr))) {
if (assoc->usage->active_seqno
!= assoc_mgr_root_assoc->usage->active_seqno)
@@ -469,7 +469,7 @@ static int _distribute_tickets(List childern_list, uint32_t tickets)
}
list_iterator_destroy(itr);
- itr = list_iterator_create(childern_list);
+ itr = list_iterator_create(children_list);
while ((assoc = list_next(itr))) {
if (assoc->usage->active_seqno
!= assoc_mgr_root_assoc->usage->active_seqno)
@@ -489,7 +489,7 @@ static int _distribute_tickets(List childern_list, uint32_t tickets)
}
if (assoc->user && assoc->usage->tickets > max_tickets)
max_tickets = assoc->usage->tickets;
- _distribute_tickets(assoc->usage->childern_list,
+ _distribute_tickets(assoc->usage->children_list,
assoc->usage->tickets);
}
list_iterator_destroy(itr);
@@ -1232,7 +1232,7 @@ static void *_decay_thread(void *no_data)
/* now calculate all the normalized usage here */
assoc_mgr_lock(&locks);
_set_children_usage_efctv(
- assoc_mgr_root_assoc->usage->childern_list);
+ assoc_mgr_root_assoc->usage->children_list);
assoc_mgr_unlock(&locks);
if (!last_ran)
@@ -1343,7 +1343,7 @@ static void *_decay_thread(void *no_data)
max_tickets = 0;
assoc_mgr_root_assoc->usage->tickets = (uint32_t) -1;
_distribute_tickets(
- assoc_mgr_root_assoc->usage->childern_list,
+ assoc_mgr_root_assoc->usage->children_list,
(uint32_t) -1);
assoc_mgr_unlock(&locks);
diff --git a/src/sacctmgr/file_functions.c b/src/sacctmgr/file_functions.c
index 43732845e1c..7359dd193db 100644
--- a/src/sacctmgr/file_functions.c
+++ b/src/sacctmgr/file_functions.c
@@ -1598,7 +1598,7 @@ static slurmdb_association_rec_t *_set_assoc_up(sacctmgr_file_opts_t *file_opts,
return assoc;
}
-static int _print_file_slurmdb_hierarchical_rec_childern(
+static int _print_file_slurmdb_hierarchical_rec_children(
FILE *fd, List slurmdb_hierarchical_rec_list,
List user_list, List acct_list)
{
@@ -1817,10 +1817,10 @@ extern int print_file_slurmdb_hierarchical_rec_list(
itr = list_iterator_create(slurmdb_hierarchical_rec_list);
while ((slurmdb_hierarchical_rec = list_next(itr))) {
/* info("got here %d with %d from %s %s", */
-/* depth, list_count(slurmdb_hierarchical_rec->childern), */
+/* depth, list_count(slurmdb_hierarchical_rec->children), */
/* slurmdb_hierarchical_rec->assoc->acct,
slurmdb_hierarchical_rec->assoc->user); */
- if (!list_count(slurmdb_hierarchical_rec->childern))
+ if (!list_count(slurmdb_hierarchical_rec->children))
continue;
if (fprintf(fd, "Parent - %s\n",
slurmdb_hierarchical_rec->assoc->acct) < 0) {
@@ -1830,10 +1830,10 @@ extern int print_file_slurmdb_hierarchical_rec_list(
info("%s - %s", "Parent",
slurmdb_hierarchical_rec->assoc->acct);
/* info("sending %d from %s", */
-/* list_count(slurmdb_hierarchical_rec->childern), */
+/* list_count(slurmdb_hierarchical_rec->children), */
/* slurmdb_hierarchical_rec->assoc->acct); */
- _print_file_slurmdb_hierarchical_rec_childern(
- fd, slurmdb_hierarchical_rec->childern,
+ _print_file_slurmdb_hierarchical_rec_children(
+ fd, slurmdb_hierarchical_rec->children,
user_list, acct_list);
}
list_iterator_destroy(itr);
@@ -2223,7 +2223,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
exit_code=1;
fprintf(stderr, " line(%d) You need to add "
"this parent (%s) as a child before "
- "you can add childern to it.\n",
+ "you can add children to it.\n",
lc, parent);
break;
}
@@ -2232,7 +2232,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
parent = xstrdup("root");
printf(" No parent given creating off root, "
"If incorrect specify 'Parent - name' "
- "before any childern in your file\n");
+ "before any children in your file\n");
}
if (!strcasecmp("Project", object)
diff --git a/src/sview/common.c b/src/sview/common.c
index 34b3cbc5cec..6c2f1261542 100644
--- a/src/sview/common.c
+++ b/src/sview/common.c
@@ -1762,7 +1762,7 @@ extern void destroy_popup_info(void *arg)
if (popup_win) {
*popup_win->running = 0;
g_mutex_lock(sview_mutex);
- /* these are all childern of each other so must
+ /* these are all children of each other so must
be freed in this order */
if (popup_win->grid_button_list) {
list_destroy(popup_win->grid_button_list);
diff --git a/src/sview/sview.c b/src/sview/sview.c
index 6c02f2c0a44..d6137731688 100644
--- a/src/sview/sview.c
+++ b/src/sview/sview.c
@@ -1466,26 +1466,26 @@ extern void _change_cluster_main(GtkComboBox *combo, gpointer extra)
node_tab = gtk_container_get_focus_child(GTK_CONTAINER(node_tab));
#else
/* See above comment. Since gtk_container_get_focus_child
- * doesn't exist yet we will just traverse the childern until
+ * doesn't exist yet we will just traverse the children until
* we find the label widget and then break.
*/
{
int i = 0;
- GList *childern = gtk_container_get_children(
+ GList *children = gtk_container_get_children(
GTK_CONTAINER(node_tab));
- while ((node_tab = g_list_nth_data(childern, i++))) {
+ while ((node_tab = g_list_nth_data(children, i++))) {
int j = 0;
- GList *childern2 = gtk_container_get_children(
+ GList *children2 = gtk_container_get_children(
GTK_CONTAINER(node_tab));
- while ((node_tab = g_list_nth_data(childern2, j++))) {
+ while ((node_tab = g_list_nth_data(children2, j++))) {
if (GTK_IS_LABEL(node_tab))
break;
}
- g_list_free(childern2);
+ g_list_free(children2);
if (node_tab)
break;
}
- g_list_free(childern);
+ g_list_free(children);
}
#endif
if (node_tab)
diff --git a/testsuite/expect/test24.1.prog.c b/testsuite/expect/test24.1.prog.c
index 9de4877a9e8..177e4f2800b 100644
--- a/testsuite/expect/test24.1.prog.c
+++ b/testsuite/expect/test24.1.prog.c
@@ -83,7 +83,7 @@ int _setup_assoc_list(void)
assoc_mgr_qos_list =
list_create(slurmdb_destroy_qos_rec);
- /* we just want make it so we setup_childern so just pretend
+ /* we just want make it so we setup_children so just pretend
* we are running off cache */
running_cache = 1;
assoc_mgr_init(NULL, NULL, SLURM_SUCCESS);
--
GitLab