From cdfd4c904831b0a7f05bd1ef312f8f4244c462bf Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Wed, 8 Dec 2010 22:06:59 +0000
Subject: [PATCH] spacing fixed

---
 src/common/assoc_mgr.c | 977 +++++++++++++++++++++--------------------
 1 file changed, 489 insertions(+), 488 deletions(-)

diff --git a/src/common/assoc_mgr.c b/src/common/assoc_mgr.c
index 2a0cb42325f..859709d05c6 100644
--- a/src/common/assoc_mgr.c
+++ b/src/common/assoc_mgr.c
@@ -83,7 +83,7 @@ static void _normalize_assoc_shares(slurmdb_association_rec_t *assoc)
 	}
 
 	assoc2->usage->shares_norm = 1.0;
-	while(assoc->usage->parent_assoc_ptr) {
+	while (assoc->usage->parent_assoc_ptr) {
 		if (assoc->shares_raw != SLURMDB_FS_USE_PARENT)
 			assoc2->usage->shares_norm *=
 				(double)assoc->shares_raw /
@@ -95,7 +95,7 @@ static void _normalize_assoc_shares(slurmdb_association_rec_t *assoc)
 static int _addto_used_info(slurmdb_association_rec_t *assoc1,
 			    slurmdb_association_rec_t *assoc2)
 {
-	if(!assoc1 || !assoc2)
+	if (!assoc1 || !assoc2)
 		return SLURM_ERROR;
 
 	assoc1->usage->grp_used_cpus += assoc2->usage->grp_used_cpus;
@@ -111,7 +111,7 @@ static int _addto_used_info(slurmdb_association_rec_t *assoc1,
 
 static int _clear_used_info(slurmdb_association_rec_t *assoc)
 {
-	if(!assoc)
+	if (!assoc)
 		return SLURM_ERROR;
 
 	assoc->usage->grp_used_cpus = 0;
@@ -146,12 +146,12 @@ static int _change_user_name(slurmdb_user_rec_t *user)
 	} else
 		user->uid = pw_uid;
 
-	if(assoc_mgr_association_list) {
+	if (assoc_mgr_association_list) {
 		itr = list_iterator_create(assoc_mgr_association_list);
-		while((assoc = list_next(itr))) {
-			if(!assoc->user)
+		while ((assoc = list_next(itr))) {
+			if (!assoc->user)
 				continue;
-			if(!strcmp(user->old_name, assoc->user)) {
+			if (!strcmp(user->old_name, assoc->user)) {
 				xfree(assoc->user);
 				assoc->user = xstrdup(user->name);
 				assoc->uid = user->uid;
@@ -161,10 +161,10 @@ static int _change_user_name(slurmdb_user_rec_t *user)
 		list_iterator_destroy(itr);
 	}
 
-	if(assoc_mgr_wckey_list) {
+	if (assoc_mgr_wckey_list) {
 		itr = list_iterator_create(assoc_mgr_wckey_list);
-		while((wckey = list_next(itr))) {
-			if(!strcmp(user->old_name, wckey->user)) {
+		while ((wckey = list_next(itr))) {
+			if (!strcmp(user->old_name, wckey->user)) {
 				xfree(wckey->user);
 				assoc->user = xstrdup(wckey->name);
 				wckey->uid = user->uid;
@@ -183,22 +183,22 @@ static int _grab_parents_qos(slurmdb_association_rec_t *assoc)
 	char *qos_char = NULL;
 	ListIterator itr = NULL;
 
-	if(!assoc)
+	if (!assoc)
 		return SLURM_ERROR;
 
-	if(assoc->qos_list)
+	if (assoc->qos_list)
 		list_flush(assoc->qos_list);
 	else
 		assoc->qos_list = list_create(slurm_destroy_char);
 
 	parent_assoc = assoc->usage->parent_assoc_ptr;
 
-	if(!parent_assoc || !parent_assoc->qos_list
-	   || !list_count(parent_assoc->qos_list))
+	if (!parent_assoc || !parent_assoc->qos_list
+	    || !list_count(parent_assoc->qos_list))
 		return SLURM_SUCCESS;
 
 	itr = list_iterator_create(parent_assoc->qos_list);
-	while((qos_char = list_next(itr)))
+	while ((qos_char = list_next(itr)))
 		list_append(assoc->qos_list, xstrdup(qos_char));
 	list_iterator_destroy(itr);
 
@@ -212,12 +212,12 @@ static int _local_update_assoc_qos_list(slurmdb_association_rec_t *assoc,
 	char *new_qos = NULL, *curr_qos = NULL;
 	int flushed = 0;
 
-	if(!assoc || !new_qos_list) {
+	if (!assoc || !new_qos_list) {
 		error("need both new qos_list and an association to update");
 		return SLURM_ERROR;
 	}
 
-	if(!list_count(new_qos_list)) {
+	if (!list_count(new_qos_list)) {
 		_grab_parents_qos(assoc);
 		return SLURM_SUCCESS;
 	}
@@ -229,33 +229,33 @@ static int _local_update_assoc_qos_list(slurmdb_association_rec_t *assoc,
 	new_qos_itr = list_iterator_create(new_qos_list);
 	curr_qos_itr = list_iterator_create(assoc->qos_list);
 
-	while((new_qos = list_next(new_qos_itr))) {
-		if(new_qos[0] == '-') {
-			while((curr_qos = list_next(curr_qos_itr))) {
-				if(!strcmp(curr_qos, new_qos+1)) {
+	while ((new_qos = list_next(new_qos_itr))) {
+		if (new_qos[0] == '-') {
+			while ((curr_qos = list_next(curr_qos_itr))) {
+				if (!strcmp(curr_qos, new_qos+1)) {
 					list_delete_item(curr_qos_itr);
 					break;
 				}
 			}
 
 			list_iterator_reset(curr_qos_itr);
-		} else if(new_qos[0] == '+') {
-			while((curr_qos = list_next(curr_qos_itr)))
-				if(!strcmp(curr_qos, new_qos+1))
+		} else if (new_qos[0] == '+') {
+			while ((curr_qos = list_next(curr_qos_itr)))
+				if (!strcmp(curr_qos, new_qos+1))
 					break;
 
-			if(!curr_qos) {
+			if (!curr_qos) {
 				list_append(assoc->qos_list,
 					    xstrdup(new_qos+1));
 				list_iterator_reset(curr_qos_itr);
 			}
-		} else if(new_qos[0] == '=') {
-			if(!flushed)
+		} else if (new_qos[0] == '=') {
+			if (!flushed)
 				list_flush(assoc->qos_list);
 			list_append(assoc->qos_list, xstrdup(new_qos+1));
 			flushed = 1;
-		} else if(new_qos[0]) {
-			if(!flushed)
+		} else if (new_qos[0]) {
+			if (!flushed)
 				list_flush(assoc->qos_list);
 			list_append(assoc->qos_list, xstrdup(new_qos));
 			flushed = 1;
@@ -332,20 +332,20 @@ static int _set_assoc_parent_and_user(slurmdb_association_rec_t *assoc,
 
 	xassert(assoc_mgr_user_list);
 
-	if(reset) {
+	if (reset) {
 		last_acct_parent = NULL;
 		last_parent = NULL;
 	}
 
-	if(!assoc || !assoc_list) {
+	if (!assoc || !assoc_list) {
 		error("you didn't give me an association");
 		return SLURM_ERROR;
 	}
 
-	if(!assoc->usage)
+	if (!assoc->usage)
 		assoc->usage = create_assoc_mgr_association_usage();
 
-	if(assoc->parent_id) {
+	if (assoc->parent_id) {
 		/* To speed things up we are first looking if we have
 		   a parent_id to look for.  If that doesn't work see
 		   if the last parent we had was what we are looking
@@ -354,18 +354,18 @@ static int _set_assoc_parent_and_user(slurmdb_association_rec_t *assoc,
 		   will look for it in the list.  If it isn't there we
 		   will just add it to the parent and call it good
 		*/
-		if(last_parent && assoc->parent_id == last_parent->id) {
+		if (last_parent && assoc->parent_id == last_parent->id) {
 			assoc->usage->parent_assoc_ptr = last_parent;
-		} else if(last_acct_parent
-			  && assoc->parent_id == last_acct_parent->id) {
+		} else if (last_acct_parent
+			   && assoc->parent_id == last_acct_parent->id) {
 			assoc->usage->parent_assoc_ptr = last_acct_parent;
 		} else {
 			slurmdb_association_rec_t *assoc2 = NULL;
 			ListIterator itr = list_iterator_create(assoc_list);
-			while((assoc2 = list_next(itr))) {
-				if(assoc2->id == assoc->parent_id) {
+			while ((assoc2 = list_next(itr))) {
+				if (assoc2->id == assoc->parent_id) {
 					assoc->usage->parent_assoc_ptr = assoc2;
-					if(assoc->user)
+					if (assoc->user)
 						last_parent = assoc2;
 					else
 						last_acct_parent = assoc2;
@@ -378,8 +378,8 @@ static int _set_assoc_parent_and_user(slurmdb_association_rec_t *assoc,
 			if (!assoc->usage->parent_assoc_ptr->usage)
 				assoc->usage->parent_assoc_ptr->usage =
 					create_assoc_mgr_association_usage();
-			if(!assoc->usage->
-			   parent_assoc_ptr->usage->childern_list)
+			if (!assoc->usage->
+			    parent_assoc_ptr->usage->childern_list)
 				assoc->usage->
 					parent_assoc_ptr->usage->childern_list =
 					list_create(NULL);
@@ -388,7 +388,7 @@ static int _set_assoc_parent_and_user(slurmdb_association_rec_t *assoc,
 				    assoc);
 		}
 
-		if(assoc == assoc->usage->parent_assoc_ptr) {
+		if (assoc == assoc->usage->parent_assoc_ptr) {
 			assoc->usage->parent_assoc_ptr = NULL;
 			error("association %u was pointing to "
 			      "itself as it's parent",
@@ -400,7 +400,7 @@ static int _set_assoc_parent_and_user(slurmdb_association_rec_t *assoc,
 		assoc_mgr_root_assoc = assoc;
 		/* set up new root since if running off cache the
 		   total usage for the cluster doesn't get set up again */
-		if(last_root) {
+		if (last_root) {
 			assoc_mgr_root_assoc->usage->usage_raw =
 				last_root->usage->usage_raw;
 			assoc_mgr_root_assoc->usage->usage_norm =
@@ -408,7 +408,7 @@ static int _set_assoc_parent_and_user(slurmdb_association_rec_t *assoc,
 		}
 	}
 
-	if(assoc->user) {
+	if (assoc->user) {
 		uid_t pw_uid;
 
 		if (uid_from_string(assoc->user, &pw_uid) < 0)
@@ -419,10 +419,10 @@ static int _set_assoc_parent_and_user(slurmdb_association_rec_t *assoc,
 		_set_user_default_acct(assoc);
 
 		/* get the qos bitmap here */
-		if(g_qos_count > 0) {
-			if(!assoc->usage->valid_qos
-			   || (bit_size(assoc->usage->valid_qos)
-			       != g_qos_count)) {
+		if (g_qos_count > 0) {
+			if (!assoc->usage->valid_qos
+			    || (bit_size(assoc->usage->valid_qos)
+				!= g_qos_count)) {
 				FREE_NULL_BITMAP(assoc->usage->valid_qos);
 				assoc->usage->valid_qos =
 					bit_alloc(g_qos_count);
@@ -432,9 +432,9 @@ static int _set_assoc_parent_and_user(slurmdb_association_rec_t *assoc,
 					    - 1));
 			set_qos_bitstr_from_list(assoc->usage->valid_qos,
 						 assoc->qos_list);
-			if(((int32_t)assoc->def_qos_id > 0)
-			   && !bit_test(assoc->usage->valid_qos,
-					assoc->def_qos_id)) {
+			if (((int32_t)assoc->def_qos_id > 0)
+			    && !bit_test(assoc->usage->valid_qos,
+					 assoc->def_qos_id)) {
 				error("assoc %u doesn't have access "
 				      "to it's default %s",
 				      assoc->id,
@@ -466,7 +466,7 @@ static int _post_association_list(List assoc_list)
 	itr = list_iterator_create(assoc_list);
 
 	//START_TIMER;
-	while((assoc = list_next(itr))) {
+	while ((assoc = list_next(itr))) {
 		_set_assoc_parent_and_user(assoc, assoc_list, reset);
 		reset = 0;
 	}
@@ -476,10 +476,10 @@ static int _post_association_list(List assoc_list)
 		ListIterator itr2 = NULL;
 		/* Now set the shares on each level */
 		list_iterator_reset(itr);
-		while((assoc = list_next(itr))) {
+		while ((assoc = list_next(itr))) {
 			int count = 0;
-			if(!assoc->usage->childern_list
-			   || !list_count(assoc->usage->childern_list))
+			if (!assoc->usage->childern_list
+			    || !list_count(assoc->usage->childern_list))
 				continue;
 			itr2 = list_iterator_create(
 				assoc->usage->childern_list);
@@ -490,13 +490,13 @@ static int _post_association_list(List assoc_list)
 					count += assoc2->shares_raw;
 			}
 			list_iterator_reset(itr2);
-			while((assoc2 = list_next(itr2)))
+			while ((assoc2 = list_next(itr2)))
 				assoc2->usage->level_shares = count;
 			list_iterator_destroy(itr2);
 		}
 		/* Now normalize the static shares */
 		list_iterator_reset(itr);
-		while((assoc = list_next(itr)))
+		while ((assoc = list_next(itr)))
 			_normalize_assoc_shares(assoc);
 	}
 	list_iterator_destroy(itr);
@@ -512,7 +512,7 @@ static int _post_user_list(List user_list)
 	slurmdb_user_rec_t *user = NULL;
 	ListIterator itr = list_iterator_create(user_list);
 	//START_TIMER;
-	while((user = list_next(itr))) {
+	while ((user = list_next(itr))) {
 		uid_t pw_uid;
 		/* Just to make sure we have a default_wckey since it
 		   might not be set up yet.
@@ -520,7 +520,7 @@ static int _post_user_list(List user_list)
 		if (!user->default_wckey)
 			user->default_wckey = xstrdup("");
 		if (uid_from_string (user->name, &pw_uid) < 0) {
-			if(slurmdbd_conf)
+			if (slurmdbd_conf)
 				debug("post user: couldn't get a "
 				      "uid for user %s",
 				      user->name);
@@ -540,10 +540,10 @@ static int _post_wckey_list(List wckey_list)
 
 	xassert(assoc_mgr_user_list);
 
-	while((wckey = list_next(itr))) {
+	while ((wckey = list_next(itr))) {
 		uid_t pw_uid;
 		if (uid_from_string (wckey->user, &pw_uid) < 0) {
-			if(slurmdbd_conf)
+			if (slurmdbd_conf)
 				debug("post wckey: couldn't get a uid "
 				      "for user %s",
 				      wckey->user);
@@ -564,30 +564,30 @@ static int _post_qos_list(List qos_list)
 	g_qos_count = 0;
 	g_qos_max_priority = 0;
 
-	while((qos = list_next(itr))) {
+	while ((qos = list_next(itr))) {
 		if (qos->flags & QOS_FLAG_NOTSET)
 			qos->flags = 0;
 
 		if (!qos->usage)
 			qos->usage = create_assoc_mgr_qos_usage();
 		/* get the highest qos value to create bitmaps from */
-		if(qos->id > g_qos_count)
+		if (qos->id > g_qos_count)
 			g_qos_count = qos->id;
 
-		if(qos->priority > g_qos_max_priority)
+		if (qos->priority > g_qos_max_priority)
 			g_qos_max_priority = qos->priority;
 	}
 	/* Since in the database id's don't start at 1
 	   instead of 0 we need to ignore the 0 bit and start
 	   with 1 so increase the count by 1.
 	*/
-	if(g_qos_count > 0)
+	if (g_qos_count > 0)
 		g_qos_count++;
 
-	if(g_qos_max_priority) {
+	if (g_qos_max_priority) {
 		list_iterator_reset(itr);
 
-		while((qos = list_next(itr))) {
+		while ((qos = list_next(itr))) {
 			qos->usage->norm_priority = (double)qos->priority
 				/ (double)g_qos_max_priority;
 		}
@@ -606,14 +606,14 @@ static int _get_assoc_mgr_association_list(void *db_conn, int enforce)
 
 //	DEF_TIMERS;
 	assoc_mgr_lock(&locks);
-	if(assoc_mgr_association_list)
+	if (assoc_mgr_association_list)
 		list_destroy(assoc_mgr_association_list);
 
 	memset(&assoc_q, 0, sizeof(slurmdb_association_cond_t));
-	if(assoc_mgr_cluster_name) {
+	if (assoc_mgr_cluster_name) {
 		assoc_q.cluster_list = list_create(NULL);
 		list_append(assoc_q.cluster_list, assoc_mgr_cluster_name);
-	} else if((enforce & ACCOUNTING_ENFORCE_ASSOCS) && !slurmdbd_conf) {
+	} else if ((enforce & ACCOUNTING_ENFORCE_ASSOCS) && !slurmdbd_conf) {
 		error("_get_assoc_mgr_association_list: "
 		      "no cluster name here going to get "
 		      "all associations.");
@@ -624,16 +624,16 @@ static int _get_assoc_mgr_association_list(void *db_conn, int enforce)
 		acct_storage_g_get_associations(db_conn, uid, &assoc_q);
 //	END_TIMER2("get_associations");
 
-	if(assoc_q.cluster_list)
+	if (assoc_q.cluster_list)
 		list_destroy(assoc_q.cluster_list);
 
-	if(!assoc_mgr_association_list) {
+	if (!assoc_mgr_association_list) {
 		/* create list so we don't keep calling this if there
 		   isn't anything there */
 		assoc_mgr_association_list =
 			list_create(slurmdb_destroy_association_rec);
 		assoc_mgr_unlock(&locks);
-		if(enforce & ACCOUNTING_ENFORCE_ASSOCS) {
+		if (enforce & ACCOUNTING_ENFORCE_ASSOCS) {
 			error("_get_assoc_mgr_association_list: "
 			      "no list was made.");
 			return SLURM_ERROR;
@@ -658,13 +658,13 @@ static int _get_assoc_mgr_qos_list(void *db_conn, int enforce)
 				   WRITE_LOCK, NO_LOCK, NO_LOCK };
 
 	assoc_mgr_lock(&locks);
-	if(assoc_mgr_qos_list)
+	if (assoc_mgr_qos_list)
 		list_destroy(assoc_mgr_qos_list);
 	assoc_mgr_qos_list = acct_storage_g_get_qos(db_conn, uid, NULL);
 
-	if(!assoc_mgr_qos_list) {
+	if (!assoc_mgr_qos_list) {
 		assoc_mgr_unlock(&locks);
-		if(enforce & ACCOUNTING_ENFORCE_ASSOCS) {
+		if (enforce & ACCOUNTING_ENFORCE_ASSOCS) {
 			error("_get_assoc_mgr_qos_list: no list was made.");
 			return SLURM_ERROR;
 		} else {
@@ -689,13 +689,13 @@ static int _get_assoc_mgr_user_list(void *db_conn, int enforce)
 	user_q.with_coords = 1;
 
 	assoc_mgr_lock(&locks);
-	if(assoc_mgr_user_list)
+	if (assoc_mgr_user_list)
 		list_destroy(assoc_mgr_user_list);
 	assoc_mgr_user_list = acct_storage_g_get_users(db_conn, uid, &user_q);
 
-	if(!assoc_mgr_user_list) {
+	if (!assoc_mgr_user_list) {
 		assoc_mgr_unlock(&locks);
-		if(enforce & ACCOUNTING_ENFORCE_ASSOCS) {
+		if (enforce & ACCOUNTING_ENFORCE_ASSOCS) {
 			error("_get_assoc_mgr_user_list: "
 			      "no list was made.");
 			return SLURM_ERROR;
@@ -720,14 +720,14 @@ static int _get_assoc_mgr_wckey_list(void *db_conn, int enforce)
 
 //	DEF_TIMERS;
 	assoc_mgr_lock(&locks);
-	if(assoc_mgr_wckey_list)
+	if (assoc_mgr_wckey_list)
 		list_destroy(assoc_mgr_wckey_list);
 
 	memset(&wckey_q, 0, sizeof(slurmdb_wckey_cond_t));
-	if(assoc_mgr_cluster_name) {
+	if (assoc_mgr_cluster_name) {
 		wckey_q.cluster_list = list_create(NULL);
 		list_append(wckey_q.cluster_list, assoc_mgr_cluster_name);
-	} else if((enforce & ACCOUNTING_ENFORCE_WCKEYS) && !slurmdbd_conf) {
+	} else if ((enforce & ACCOUNTING_ENFORCE_WCKEYS) && !slurmdbd_conf) {
 		error("_get_assoc_mgr_wckey_list: "
 		      "no cluster name here going to get "
 		      "all wckeys.");
@@ -738,15 +738,15 @@ static int _get_assoc_mgr_wckey_list(void *db_conn, int enforce)
 		acct_storage_g_get_wckeys(db_conn, uid, &wckey_q);
 //	END_TIMER2("get_wckeys");
 
-	if(wckey_q.cluster_list)
+	if (wckey_q.cluster_list)
 		list_destroy(wckey_q.cluster_list);
 
-	if(!assoc_mgr_wckey_list) {
+	if (!assoc_mgr_wckey_list) {
 		/* create list so we don't keep calling this if there
 		   isn't anything there */
 		assoc_mgr_wckey_list = list_create(slurmdb_destroy_wckey_rec);
 		assoc_mgr_unlock(&locks);
-		if(enforce & ACCOUNTING_ENFORCE_WCKEYS) {
+		if (enforce & ACCOUNTING_ENFORCE_WCKEYS) {
 			error("_get_assoc_mgr_wckey_list: "
 			      "no list was made.");
 			return SLURM_ERROR;
@@ -777,10 +777,10 @@ static int _refresh_assoc_mgr_association_list(void *db_conn, int enforce)
 //	DEF_TIMERS;
 
 	memset(&assoc_q, 0, sizeof(slurmdb_association_cond_t));
-	if(assoc_mgr_cluster_name) {
+	if (assoc_mgr_cluster_name) {
 		assoc_q.cluster_list = list_create(NULL);
 		list_append(assoc_q.cluster_list, assoc_mgr_cluster_name);
-	} else if((enforce & ACCOUNTING_ENFORCE_ASSOCS) && !slurmdbd_conf) {
+	} else if ((enforce & ACCOUNTING_ENFORCE_ASSOCS) && !slurmdbd_conf) {
 		error("_refresh_assoc_mgr_association_list: "
 		      "no cluster name here going to get "
 		      "all associations.");
@@ -795,10 +795,10 @@ static int _refresh_assoc_mgr_association_list(void *db_conn, int enforce)
 		acct_storage_g_get_associations(db_conn, uid, &assoc_q);
 //	END_TIMER2("get_associations");
 
-	if(assoc_q.cluster_list)
+	if (assoc_q.cluster_list)
 		list_destroy(assoc_q.cluster_list);
 
-	if(!assoc_mgr_association_list) {
+	if (!assoc_mgr_association_list) {
 		assoc_mgr_association_list = current_assocs;
 		assoc_mgr_unlock(&locks);
 
@@ -809,7 +809,7 @@ static int _refresh_assoc_mgr_association_list(void *db_conn, int enforce)
 
 	_post_association_list(assoc_mgr_association_list);
 
-	if(!current_assocs) {
+	if (!current_assocs) {
 		assoc_mgr_unlock(&locks);
 		return SLURM_SUCCESS;
 	}
@@ -819,15 +819,15 @@ static int _refresh_assoc_mgr_association_list(void *db_conn, int enforce)
 
 	/* add used limits We only look for the user associations to
 	 * do the parents since a parent may have moved */
-	while((curr_assoc = list_next(curr_itr))) {
-		if(!curr_assoc->user)
+	while ((curr_assoc = list_next(curr_itr))) {
+		if (!curr_assoc->user)
 			continue;
-		while((assoc = list_next(assoc_mgr_itr))) {
-			if(assoc->id == curr_assoc->id)
+		while ((assoc = list_next(assoc_mgr_itr))) {
+			if (assoc->id == curr_assoc->id)
 				break;
 		}
 
-		while(assoc) {
+		while (assoc) {
 			_addto_used_info(assoc, curr_assoc);
 			/* get the parent last since this pointer is
 			   different than the one we are updating from */
@@ -841,7 +841,7 @@ static int _refresh_assoc_mgr_association_list(void *db_conn, int enforce)
 
 	assoc_mgr_unlock(&locks);
 
-	if(current_assocs)
+	if (current_assocs)
 		list_destroy(current_assocs);
 
 	return SLURM_SUCCESS;
@@ -859,7 +859,7 @@ static int _refresh_assoc_mgr_qos_list(void *db_conn, int enforce)
 
 	current_qos = acct_storage_g_get_qos(db_conn, uid, NULL);
 
-	if(!current_qos) {
+	if (!current_qos) {
 		error("_refresh_assoc_mgr_qos_list: "
 		      "no new list given back keeping cached one.");
 		return SLURM_ERROR;
@@ -868,7 +868,7 @@ static int _refresh_assoc_mgr_qos_list(void *db_conn, int enforce)
 
 	assoc_mgr_lock(&locks);
 
-	if(assoc_mgr_qos_list)
+	if (assoc_mgr_qos_list)
 		list_destroy(assoc_mgr_qos_list);
 
 	assoc_mgr_qos_list = current_qos;
@@ -894,7 +894,7 @@ static int _refresh_assoc_mgr_user_list(void *db_conn, int enforce)
 
 	current_users = acct_storage_g_get_users(db_conn, uid, &user_q);
 
-	if(!current_users) {
+	if (!current_users) {
 		error("_refresh_assoc_mgr_user_list: "
 		      "no new list given back keeping cached one.");
 		return SLURM_ERROR;
@@ -903,7 +903,7 @@ static int _refresh_assoc_mgr_user_list(void *db_conn, int enforce)
 
 	assoc_mgr_lock(&locks);
 
-	if(assoc_mgr_user_list)
+	if (assoc_mgr_user_list)
 		list_destroy(assoc_mgr_user_list);
 
 	assoc_mgr_user_list = current_users;
@@ -948,7 +948,7 @@ static int _refresh_assoc_wckey_list(void *db_conn, int enforce)
 	_post_wckey_list(current_wckeys);
 
 	assoc_mgr_lock(&locks);
-	if(assoc_mgr_wckey_list)
+	if (assoc_mgr_wckey_list)
 		list_destroy(assoc_mgr_wckey_list);
 
 	assoc_mgr_wckey_list = current_wckeys;
@@ -1029,7 +1029,7 @@ extern int assoc_mgr_init(void *db_conn, assoc_init_args_t *args)
 
 	if (!checked_prio) {
 		char *prio = slurm_get_priority_type();
-		if(prio && !strcmp(prio, "priority/multifactor"))
+		if (prio && !strcmp(prio, "priority/multifactor"))
 			setup_children = 1;
 
 		xfree(prio);
@@ -1037,41 +1037,41 @@ extern int assoc_mgr_init(void *db_conn, assoc_init_args_t *args)
 		memset(&assoc_mgr_locks, 0, sizeof(assoc_mgr_locks));
 	}
 
-	if(args) {
+	if (args) {
 		enforce = args->enforce;
-		if(args->remove_assoc_notify)
+		if (args->remove_assoc_notify)
 			remove_assoc_notify = args->remove_assoc_notify;
-		if(args->remove_qos_notify)
+		if (args->remove_qos_notify)
 			remove_qos_notify = args->remove_qos_notify;
-		if(args->update_assoc_notify)
+		if (args->update_assoc_notify)
 			update_assoc_notify = args->update_assoc_notify;
-		if(args->remove_qos_notify)
+		if (args->remove_qos_notify)
 			update_qos_notify = args->update_qos_notify;
-		if(args->update_resvs)
+		if (args->update_resvs)
 			update_resvs = args->update_resvs;
 		cache_level = args->cache_level;
 		assoc_mgr_refresh_lists(db_conn, args);
 	}
 
-	if(running_cache) {
+	if (running_cache) {
 		debug4("No need to run assoc_mgr_init, "
 		       "we probably don't have a connection.  "
 		       "If we do use assoc_mgr_refresh_lists instead.");
 		return SLURM_SUCCESS;
 	}
 
-	if((!assoc_mgr_cluster_name) && !slurmdbd_conf) {
+	if ((!assoc_mgr_cluster_name) && !slurmdbd_conf) {
 		xfree(assoc_mgr_cluster_name);
 		assoc_mgr_cluster_name = slurm_get_cluster_name();
 	}
 
 	/* check if we can't talk to the db yet */
-	if(errno == ESLURM_ACCESS_DENIED)
+	if (errno == ESLURM_ACCESS_DENIED)
 		return SLURM_ERROR;
 
 	/* get qos before association since it is used there */
-	if((!assoc_mgr_qos_list) && (cache_level & ASSOC_MGR_CACHE_QOS))
-		if(_get_assoc_mgr_qos_list(db_conn, enforce) == SLURM_ERROR)
+	if ((!assoc_mgr_qos_list) && (cache_level & ASSOC_MGR_CACHE_QOS))
+		if (_get_assoc_mgr_qos_list(db_conn, enforce) == SLURM_ERROR)
 			return SLURM_ERROR;
 
 	/* get user before association/wckey since it is used there */
@@ -1079,24 +1079,24 @@ extern int assoc_mgr_init(void *db_conn, assoc_init_args_t *args)
 		if (_get_assoc_mgr_user_list(db_conn, enforce) == SLURM_ERROR)
 			return SLURM_ERROR;
 
-	if((!assoc_mgr_association_list)
-	   && (cache_level & ASSOC_MGR_CACHE_ASSOC))
-		if(_get_assoc_mgr_association_list(db_conn, enforce)
-		   == SLURM_ERROR)
+	if ((!assoc_mgr_association_list)
+	    && (cache_level & ASSOC_MGR_CACHE_ASSOC))
+		if (_get_assoc_mgr_association_list(db_conn, enforce)
+		    == SLURM_ERROR)
 			return SLURM_ERROR;
 
 	if (assoc_mgr_association_list && !setup_children) {
 		slurmdb_association_rec_t *assoc = NULL;
 		ListIterator itr =
 			list_iterator_create(assoc_mgr_association_list);
-		while((assoc = list_next(itr))) {
+		while ((assoc = list_next(itr))) {
 			log_assoc_rec(assoc, assoc_mgr_qos_list);
 		}
 		list_iterator_destroy(itr);
 	}
 
-	if((!assoc_mgr_wckey_list) && (cache_level & ASSOC_MGR_CACHE_WCKEY))
-		if(_get_assoc_mgr_wckey_list(db_conn, enforce) == SLURM_ERROR)
+	if ((!assoc_mgr_wckey_list) && (cache_level & ASSOC_MGR_CACHE_WCKEY))
+		if (_get_assoc_mgr_wckey_list(db_conn, enforce) == SLURM_ERROR)
 			return SLURM_ERROR;
 
 	return SLURM_SUCCESS;
@@ -1104,16 +1104,16 @@ extern int assoc_mgr_init(void *db_conn, assoc_init_args_t *args)
 
 extern int assoc_mgr_fini(char *state_save_location)
 {
-	if(state_save_location)
+	if (state_save_location)
 		dump_assoc_mgr_state(state_save_location);
 
-	if(assoc_mgr_association_list)
+	if (assoc_mgr_association_list)
 		list_destroy(assoc_mgr_association_list);
-	if(assoc_mgr_qos_list)
+	if (assoc_mgr_qos_list)
 		list_destroy(assoc_mgr_qos_list);
-	if(assoc_mgr_user_list)
+	if (assoc_mgr_user_list)
 		list_destroy(assoc_mgr_user_list);
-	if(assoc_mgr_wckey_list)
+	if (assoc_mgr_wckey_list)
 		list_destroy(assoc_mgr_wckey_list);
 	xfree(assoc_mgr_cluster_name);
 	assoc_mgr_association_list = NULL;
@@ -1189,8 +1189,8 @@ extern void destroy_assoc_mgr_association_usage(void *object)
 	assoc_mgr_association_usage_t *usage =
 		(assoc_mgr_association_usage_t *)object;
 
-	if(usage) {
-		if(usage->childern_list)
+	if (usage) {
+		if (usage->childern_list)
 			list_destroy(usage->childern_list);
 		FREE_NULL_BITMAP(usage->valid_qos);
 
@@ -1211,10 +1211,10 @@ extern void destroy_assoc_mgr_qos_usage(void *object)
 	assoc_mgr_qos_usage_t *usage =
 		(assoc_mgr_qos_usage_t *)object;
 
-	if(usage) {
-		if(usage->job_list)
+	if (usage) {
+		if (usage->job_list)
 			list_destroy(usage->job_list);
-		if(usage->user_limit_list)
+		if (usage->user_limit_list)
 			list_destroy(usage->user_limit_list);
 		xfree(usage);
 	}
@@ -1236,21 +1236,21 @@ extern int assoc_mgr_get_user_assocs(void *db_conn,
 	xassert(assoc->uid != NO_VAL);
 	xassert(assoc_list);
 
-	if(!assoc_mgr_association_list) {
-		if(_get_assoc_mgr_association_list(db_conn, enforce)
-		   == SLURM_ERROR)
+	if (!assoc_mgr_association_list) {
+		if (_get_assoc_mgr_association_list(db_conn, enforce)
+		    == SLURM_ERROR)
 			return SLURM_ERROR;
 	}
 
-	if((!assoc_mgr_association_list
-	    || !list_count(assoc_mgr_association_list))
-	   && !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
+	if ((!assoc_mgr_association_list
+	     || !list_count(assoc_mgr_association_list))
+	    && !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
 		return SLURM_SUCCESS;
 
 	assoc_mgr_lock(&locks);
 	itr = list_iterator_create(assoc_mgr_association_list);
-	while((found_assoc = list_next(itr))) {
-		if(assoc->uid != found_assoc->uid) {
+	while ((found_assoc = list_next(itr))) {
+		if (assoc->uid != found_assoc->uid) {
 			debug4("not the right user %u != %u",
 			       assoc->uid, found_assoc->uid);
 			continue;
@@ -1262,7 +1262,7 @@ extern int assoc_mgr_get_user_assocs(void *db_conn,
 	list_iterator_destroy(itr);
 	assoc_mgr_unlock(&locks);
 
-	if(set)
+	if (set)
 		return SLURM_SUCCESS;
 	else {
 		debug("user %u does not have any associations", assoc->uid);
@@ -1285,12 +1285,12 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn,
 		*assoc_pptr = NULL;
 	if (!assoc_mgr_association_list) {
 		if (_get_assoc_mgr_association_list(db_conn, enforce)
-		   == SLURM_ERROR)
+		    == SLURM_ERROR)
 			return SLURM_ERROR;
 	}
 	if ((!assoc_mgr_association_list
 	     || !list_count(assoc_mgr_association_list))
-	   && !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
+	    && !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
 		return SLURM_SUCCESS;
 
 	if (!assoc->id) {
@@ -1310,8 +1310,8 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn,
 			memset(&user, 0, sizeof(slurmdb_user_rec_t));
 			user.uid = assoc->uid;
 			if (assoc_mgr_fill_in_user(db_conn, &user,
-						  enforce, NULL)
-			   == SLURM_ERROR) {
+						   enforce, NULL)
+			    == SLURM_ERROR) {
 				if (enforce & ACCOUNTING_ENFORCE_ASSOCS) {
 					error("User %d not found", assoc->uid);
 					return SLURM_ERROR;
@@ -1321,7 +1321,7 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn,
 				}
 			}
 			assoc->user = user.name;
-			if(user.default_acct)
+			if (user.default_acct)
 				assoc->acct = user.default_acct;
 			else {
 				if (enforce & ACCOUNTING_ENFORCE_ASSOCS) {
@@ -1338,7 +1338,7 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn,
 			}
 		}
 
-		if(!assoc->cluster)
+		if (!assoc->cluster)
 			assoc->cluster = assoc_mgr_cluster_name;
 	}
 /* 	info("looking for assoc of user=%s(%u), acct=%s, " */
@@ -1349,7 +1349,7 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn,
 	itr = list_iterator_create(assoc_mgr_association_list);
 	while ((found_assoc = list_next(itr))) {
 		if (assoc->id) {
-			if(assoc->id == found_assoc->id) {
+			if (assoc->id == found_assoc->id) {
 				ret_assoc = found_assoc;
 				break;
 			}
@@ -1466,7 +1466,7 @@ 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) */
+	/* if (!assoc->usage->childern_list) */
 	/* 	assoc->usage->childern_list = ret_assoc->usage->childern_list; */
 	/* assoc->usage->grp_used_cpus   = ret_assoc->usage->grp_used_cpus; */
 	/* assoc->usage->grp_used_nodes  = ret_assoc->usage->grp_used_nodes; */
@@ -1482,7 +1482,7 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn,
 
 	/* assoc->usage->used_jobs        = ret_assoc->usage->used_jobs; */
 	/* assoc->usage->used_submit_jobs = ret_assoc->usage->used_submit_jobs; */
-	/* if(assoc->usage->valid_qos) { */
+	/* if (assoc->usage->valid_qos) { */
 	/* 	FREE_NULL_BITMAP(assoc->usage->valid_qos); */
 	/* 	assoc->usage->valid_qos = bit_copy(ret_assoc->usage->valid_qos); */
 	/* } else */
@@ -1505,58 +1505,58 @@ extern int assoc_mgr_fill_in_user(void *db_conn, slurmdb_user_rec_t *user,
 	assoc_mgr_lock_t locks = { NO_LOCK, NO_LOCK,
 				   NO_LOCK, READ_LOCK, NO_LOCK };
 
-	if(user_pptr)
+	if (user_pptr)
 		*user_pptr = NULL;
-	if(!assoc_mgr_user_list)
-		if(_get_assoc_mgr_user_list(db_conn, enforce) == SLURM_ERROR)
+	if (!assoc_mgr_user_list)
+		if (_get_assoc_mgr_user_list(db_conn, enforce) == SLURM_ERROR)
 			return SLURM_ERROR;
 
-	if((!assoc_mgr_user_list || !list_count(assoc_mgr_user_list))
-	   && !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
+	if ((!assoc_mgr_user_list || !list_count(assoc_mgr_user_list))
+	    && !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
 		return SLURM_SUCCESS;
 
 	assoc_mgr_lock(&locks);
 	itr = list_iterator_create(assoc_mgr_user_list);
-	while((found_user = list_next(itr))) {
-		if(user->uid != NO_VAL) {
-			if(user->uid == found_user->uid)
+	while ((found_user = list_next(itr))) {
+		if (user->uid != NO_VAL) {
+			if (user->uid == found_user->uid)
 				break;
-		} else if(user->name
-			  && !strcasecmp(user->name, found_user->name))
+		} else if (user->name
+			   && !strcasecmp(user->name, found_user->name))
 			break;
 	}
 	list_iterator_destroy(itr);
 
-	if(!found_user) {
+	if (!found_user) {
 		assoc_mgr_unlock(&locks);
-		if(enforce & ACCOUNTING_ENFORCE_ASSOCS)
+		if (enforce & ACCOUNTING_ENFORCE_ASSOCS)
 			return SLURM_ERROR;
 		else
 			return SLURM_SUCCESS;
 	}
 
 	debug3("found correct user");
-	if(user_pptr)
+	if (user_pptr)
 		*user_pptr = found_user;
 
 	/* create coord_accts just incase the list does not exist */
-	if(!found_user->coord_accts)
+	if (!found_user->coord_accts)
 		found_user->coord_accts =
 			list_create(slurmdb_destroy_coord_rec);
 
 	user->admin_level = found_user->admin_level;
-	if(!user->assoc_list)
+	if (!user->assoc_list)
 		user->assoc_list = found_user->assoc_list;
-	if(!user->coord_accts)
+	if (!user->coord_accts)
 		user->coord_accts = found_user->coord_accts;
-	if(!user->default_acct)
+	if (!user->default_acct)
 		user->default_acct = found_user->default_acct;
-	if(!user->default_wckey)
+	if (!user->default_wckey)
 		user->default_wckey = found_user->default_wckey;
-	if(!user->name)
+	if (!user->name)
 		user->name = found_user->name;
 	user->uid = found_user->uid;
-	if(!user->wckey_list)
+	if (!user->wckey_list)
 		user->wckey_list = found_user->wckey_list;
 
 	assoc_mgr_unlock(&locks);
@@ -1573,29 +1573,29 @@ extern int assoc_mgr_fill_in_qos(void *db_conn, slurmdb_qos_rec_t *qos,
 	assoc_mgr_lock_t locks = { NO_LOCK, NO_LOCK,
 				   READ_LOCK, NO_LOCK, NO_LOCK };
 
-	if(qos_pptr)
+	if (qos_pptr)
 		*qos_pptr = NULL;
-	if(!assoc_mgr_qos_list)
-		if(_get_assoc_mgr_qos_list(db_conn, enforce) == SLURM_ERROR)
+	if (!assoc_mgr_qos_list)
+		if (_get_assoc_mgr_qos_list(db_conn, enforce) == SLURM_ERROR)
 			return SLURM_ERROR;
 
-	if((!assoc_mgr_qos_list || !list_count(assoc_mgr_qos_list))
-	   && !(enforce & ACCOUNTING_ENFORCE_QOS))
+	if ((!assoc_mgr_qos_list || !list_count(assoc_mgr_qos_list))
+	    && !(enforce & ACCOUNTING_ENFORCE_QOS))
 		return SLURM_SUCCESS;
 
 	assoc_mgr_lock(&locks);
 	itr = list_iterator_create(assoc_mgr_qos_list);
-	while((found_qos = list_next(itr))) {
-		if(qos->id == found_qos->id)
+	while ((found_qos = list_next(itr))) {
+		if (qos->id == found_qos->id)
 			break;
-		else if(qos->name && !strcasecmp(qos->name, found_qos->name))
+		else if (qos->name && !strcasecmp(qos->name, found_qos->name))
 			break;
 	}
 	list_iterator_destroy(itr);
 
-	if(!found_qos) {
+	if (!found_qos) {
 		assoc_mgr_unlock(&locks);
-		if(enforce & ACCOUNTING_ENFORCE_QOS)
+		if (enforce & ACCOUNTING_ENFORCE_QOS)
 			return SLURM_ERROR;
 		else
 			return SLURM_SUCCESS;
@@ -1605,7 +1605,7 @@ extern int assoc_mgr_fill_in_qos(void *db_conn, slurmdb_qos_rec_t *qos,
 	if (qos_pptr)
 		*qos_pptr = found_qos;
 
-	if(!qos->description)
+	if (!qos->description)
 		qos->description = found_qos->description;
 
 	qos->id = found_qos->id;
@@ -1626,10 +1626,10 @@ extern int assoc_mgr_fill_in_qos(void *db_conn, slurmdb_qos_rec_t *qos,
 	qos->max_submit_jobs_pu = found_qos->max_submit_jobs_pu;
 	qos->max_wall_pj     = found_qos->max_wall_pj;
 
-	if(!qos->name)
+	if (!qos->name)
 		qos->name = found_qos->name;
 
-	if(qos->preempt_bitstr) {
+	if (qos->preempt_bitstr) {
 		FREE_NULL_BITMAP(qos->preempt_bitstr);
 		qos->preempt_bitstr = bit_copy(found_qos->preempt_bitstr);
 	} else
@@ -1649,14 +1649,14 @@ extern int assoc_mgr_fill_in_qos(void *db_conn, slurmdb_qos_rec_t *qos,
 	/* 	found_qos->usage->grp_used_submit_jobs; */
 	/* qos->usage->grp_used_wall   = found_qos->usage->grp_used_wall; */
 
-	/* if(!qos->usage->job_list) */
+	/* if (!qos->usage->job_list) */
 	/* 	qos->usage->job_list = found_qos->usage->job_list; */
 
 	/* qos->usage->norm_priority = found_qos->usage->norm_priority; */
 
 	/* qos->usage->usage_raw = found_qos->usage->usage_raw; */
 
-	/* if(!qos->usage->user_limit_list) */
+	/* if (!qos->usage->user_limit_list) */
 	/* 	qos->usage->user_limit_list = found_qos->usage->user_limit_list; */
 	qos->usage_factor = found_qos->usage_factor;
 
@@ -1676,20 +1676,20 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, slurmdb_wckey_rec_t *wckey,
 
 	if (wckey_pptr)
 		*wckey_pptr = NULL;
-	if(!assoc_mgr_wckey_list) {
-		if(_get_assoc_mgr_wckey_list(db_conn, enforce) == SLURM_ERROR)
+	if (!assoc_mgr_wckey_list) {
+		if (_get_assoc_mgr_wckey_list(db_conn, enforce) == SLURM_ERROR)
 			return SLURM_ERROR;
 	}
-	if((!assoc_mgr_wckey_list || !list_count(assoc_mgr_wckey_list))
-	   && !(enforce & ACCOUNTING_ENFORCE_WCKEYS))
+	if ((!assoc_mgr_wckey_list || !list_count(assoc_mgr_wckey_list))
+	    && !(enforce & ACCOUNTING_ENFORCE_WCKEYS))
 		return SLURM_SUCCESS;
 
-	if(!wckey->id) {
-		if(!wckey->name) {
+	if (!wckey->id) {
+		if (!wckey->name) {
 			slurmdb_user_rec_t user;
 
-			if(wckey->uid == NO_VAL && !wckey->user) {
-				if(enforce & ACCOUNTING_ENFORCE_WCKEYS) {
+			if (wckey->uid == NO_VAL && !wckey->user) {
+				if (enforce & ACCOUNTING_ENFORCE_WCKEYS) {
 					error("get_wckey_id: "
 					      "Not enough info to "
 					      "get an wckey");
@@ -1701,10 +1701,10 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, slurmdb_wckey_rec_t *wckey,
 			memset(&user, 0, sizeof(slurmdb_user_rec_t));
 			user.uid = wckey->uid;
 			user.name = wckey->user;
-			if(assoc_mgr_fill_in_user(db_conn, &user,
-						  enforce, NULL)
-			   == SLURM_ERROR) {
-				if(enforce & ACCOUNTING_ENFORCE_WCKEYS) {
+			if (assoc_mgr_fill_in_user(db_conn, &user,
+						   enforce, NULL)
+			    == SLURM_ERROR) {
+				if (enforce & ACCOUNTING_ENFORCE_WCKEYS) {
 					error("User %d not found", wckey->uid);
 					return SLURM_ERROR;
 				} else {
@@ -1712,12 +1712,12 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, slurmdb_wckey_rec_t *wckey,
 					return SLURM_SUCCESS;
 				}
 			}
-			if(!wckey->user)
+			if (!wckey->user)
 				wckey->user = user.name;
-			if(user.default_wckey)
+			if (user.default_wckey)
 				wckey->name = user.default_wckey;
 			else {
-				if(enforce & ACCOUNTING_ENFORCE_WCKEYS) {
+				if (enforce & ACCOUNTING_ENFORCE_WCKEYS) {
 					error("User %s(%d) doesn't have a "
 					      "default wckey", user.name,
 					      user.uid);
@@ -1730,8 +1730,8 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, slurmdb_wckey_rec_t *wckey,
 				}
 			}
 
-		} else if(wckey->uid == NO_VAL && !wckey->user) {
-			if(enforce & ACCOUNTING_ENFORCE_WCKEYS) {
+		} else if (wckey->uid == NO_VAL && !wckey->user) {
+			if (enforce & ACCOUNTING_ENFORCE_WCKEYS) {
 				error("get_wckey_id: "
 				      "Not enough info 2 to "
 				      "get an wckey");
@@ -1742,7 +1742,7 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, slurmdb_wckey_rec_t *wckey,
 		}
 
 
-		if(!wckey->cluster)
+		if (!wckey->cluster)
 			wckey->cluster = assoc_mgr_cluster_name;
 	}
 /* 	info("looking for wckey of user=%s(%u), name=%s, " */
@@ -1751,44 +1751,45 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, slurmdb_wckey_rec_t *wckey,
 /* 	     wckey->cluster); */
 	assoc_mgr_lock(&locks);
 	itr = list_iterator_create(assoc_mgr_wckey_list);
-	while((found_wckey = list_next(itr))) {
-		if(wckey->id) {
-			if(wckey->id == found_wckey->id) {
+	while ((found_wckey = list_next(itr))) {
+		if (wckey->id) {
+			if (wckey->id == found_wckey->id) {
 				ret_wckey = found_wckey;
 				break;
 			}
 			continue;
 		} else {
-			if(wckey->uid != NO_VAL) {
-				if(wckey->uid != found_wckey->uid) {
+			if (wckey->uid != NO_VAL) {
+				if (wckey->uid != found_wckey->uid) {
 					debug4("not the right user %u != %u",
 					       wckey->uid, found_wckey->uid);
 					continue;
 				}
-			} else if(wckey->user && strcasecmp(wckey->user,
-							    found_wckey->user))
+			} else if (wckey->user && strcasecmp(wckey->user,
+							     found_wckey->user))
 				continue;
 
-			if(wckey->name
-			   && (!found_wckey->name
-			       || strcasecmp(wckey->name, found_wckey->name))) {
+			if (wckey->name
+			    && (!found_wckey->name
+				|| strcasecmp(wckey->name,
+					      found_wckey->name))) {
 				debug4("not the right name %s != %s",
 				       wckey->name, found_wckey->name);
 				continue;
 			}
 
 			/* only check for on the slurmdbd */
-			if(!assoc_mgr_cluster_name) {
-				if(!wckey->cluster) {
+			if (!assoc_mgr_cluster_name) {
+				if (!wckey->cluster) {
 					error("No cluster name was given "
 					      "to check against, "
 					      "we need one to get a wckey.");
 					continue;
 				}
 
-				if(found_wckey->cluster
-				   && strcasecmp(wckey->cluster,
-						 found_wckey->cluster)) {
+				if (found_wckey->cluster
+				    && strcasecmp(wckey->cluster,
+						  found_wckey->cluster)) {
 					debug4("not the right cluster");
 					continue;
 				}
@@ -1799,9 +1800,9 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, slurmdb_wckey_rec_t *wckey,
 	}
 	list_iterator_destroy(itr);
 
-	if(!ret_wckey) {
+	if (!ret_wckey) {
 		assoc_mgr_unlock(&locks);
-		if(enforce & ACCOUNTING_ENFORCE_WCKEYS)
+		if (enforce & ACCOUNTING_ENFORCE_WCKEYS)
 			return SLURM_ERROR;
 		else
 			return SLURM_SUCCESS;
@@ -1810,16 +1811,16 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, slurmdb_wckey_rec_t *wckey,
 	if (wckey_pptr)
 		*wckey_pptr = ret_wckey;
 
-	if(!wckey->cluster)
+	if (!wckey->cluster)
 		wckey->cluster = ret_wckey->cluster;
 
 	wckey->id = ret_wckey->id;
 
-	if(!wckey->name)
+	if (!wckey->name)
 		wckey->name = ret_wckey->name;
 
 	wckey->uid = ret_wckey->uid;
-	if(!wckey->user)
+	if (!wckey->user)
 		wckey->user = ret_wckey->user;
 
 	wckey->is_def = ret_wckey->is_def;
@@ -1837,31 +1838,31 @@ extern slurmdb_admin_level_t assoc_mgr_get_admin_level(void *db_conn,
 	assoc_mgr_lock_t locks = { NO_LOCK, NO_LOCK,
 				   NO_LOCK, READ_LOCK, NO_LOCK };
 
-	if(!assoc_mgr_user_list)
-		if(_get_assoc_mgr_user_list(db_conn, 0) == SLURM_ERROR)
+	if (!assoc_mgr_user_list)
+		if (_get_assoc_mgr_user_list(db_conn, 0) == SLURM_ERROR)
 			return SLURMDB_ADMIN_NOTSET;
 
-	if(!assoc_mgr_user_list)
+	if (!assoc_mgr_user_list)
 		return SLURMDB_ADMIN_NOTSET;
 
 	assoc_mgr_lock(&locks);
 	itr = list_iterator_create(assoc_mgr_user_list);
-	while((found_user = list_next(itr))) {
-		if(uid == found_user->uid)
+	while ((found_user = list_next(itr))) {
+		if (uid == found_user->uid)
 			break;
 	}
 	list_iterator_destroy(itr);
 	assoc_mgr_unlock(&locks);
 
-	if(found_user)
+	if (found_user)
 		return found_user->admin_level;
 
 	return SLURMDB_ADMIN_NOTSET;
 }
 
 extern bool assoc_mgr_is_user_acct_coord(void *db_conn,
-					uint32_t uid,
-					char *acct_name)
+					 uint32_t uid,
+					 char *acct_name)
 {
 	ListIterator itr = NULL;
 	slurmdb_coord_rec_t *acct = NULL;
@@ -1869,33 +1870,33 @@ extern bool assoc_mgr_is_user_acct_coord(void *db_conn,
 	assoc_mgr_lock_t locks = { NO_LOCK, NO_LOCK,
 				   NO_LOCK, READ_LOCK, NO_LOCK };
 
-	if(!assoc_mgr_user_list)
-		if(_get_assoc_mgr_user_list(db_conn, 0) == SLURM_ERROR)
+	if (!assoc_mgr_user_list)
+		if (_get_assoc_mgr_user_list(db_conn, 0) == SLURM_ERROR)
 			return false;
 
-	if(!assoc_mgr_user_list)
+	if (!assoc_mgr_user_list)
 		return false;
 
 	assoc_mgr_lock(&locks);
 	itr = list_iterator_create(assoc_mgr_user_list);
-	while((found_user = list_next(itr))) {
-		if(uid == found_user->uid)
+	while ((found_user = list_next(itr))) {
+		if (uid == found_user->uid)
 			break;
 	}
 	list_iterator_destroy(itr);
 
-	if(!found_user || !found_user->coord_accts) {
+	if (!found_user || !found_user->coord_accts) {
 		assoc_mgr_unlock(&locks);
 		return false;
 	}
 	itr = list_iterator_create(found_user->coord_accts);
-	while((acct = list_next(itr))) {
-		if(!strcmp(acct_name, acct->name))
+	while ((acct = list_next(itr))) {
+		if (!strcmp(acct_name, acct->name))
 			break;
 	}
 	list_iterator_destroy(itr);
 
-	if(acct) {
+	if (acct) {
 		assoc_mgr_unlock(&locks);
 		return true;
 	}
@@ -1920,17 +1921,17 @@ extern List assoc_mgr_get_shares(void *db_conn,
 	assoc_mgr_lock_t locks = { READ_LOCK, NO_LOCK,
 				   NO_LOCK, NO_LOCK, NO_LOCK };
 
-	if(!assoc_mgr_association_list
-	   || !list_count(assoc_mgr_association_list))
+	if (!assoc_mgr_association_list
+	    || !list_count(assoc_mgr_association_list))
 		return NULL;
 
 	memset(&user, 0, sizeof(slurmdb_user_rec_t));
 	user.uid = uid;
 
-	if(user_list && list_count(user_list))
+	if (user_list && list_count(user_list))
 		user_itr = list_iterator_create(user_list);
 
-	if(acct_list && list_count(acct_list))
+	if (acct_list && list_count(acct_list))
 		acct_itr = list_iterator_create(acct_list);
 
 	if (private_data & PRIVATE_DATA_USAGE) {
@@ -1938,15 +1939,15 @@ extern List assoc_mgr_get_shares(void *db_conn,
 		is_admin = 0;
 		/* Check permissions of the requesting user.
 		 */
-		if((uid == slurm_uid || uid == 0)
-		   || assoc_mgr_get_admin_level(db_conn, uid)
-		   >= SLURMDB_ADMIN_OPERATOR)
+		if ((uid == slurm_uid || uid == 0)
+		    || assoc_mgr_get_admin_level(db_conn, uid)
+		    >= SLURMDB_ADMIN_OPERATOR)
 			is_admin = 1;
 		else {
-			if(assoc_mgr_fill_in_user(
-				   db_conn, &user,
-				   ACCOUNTING_ENFORCE_ASSOCS, NULL)
-			   == SLURM_ERROR) {
+			if (assoc_mgr_fill_in_user(
+				    db_conn, &user,
+				    ACCOUNTING_ENFORCE_ASSOCS, NULL)
+			    == SLURM_ERROR) {
 				debug3("User %d not found", user.uid);
 				goto end_it;
 			}
@@ -1957,58 +1958,58 @@ extern List assoc_mgr_get_shares(void *db_conn,
 
 	assoc_mgr_lock(&locks);
 	itr = list_iterator_create(assoc_mgr_association_list);
-	while((assoc = list_next(itr))) {
-		if(user_itr && assoc->user) {
-			while((tmp_char = list_next(user_itr))) {
-				if(!strcasecmp(tmp_char, assoc->user))
+	while ((assoc = list_next(itr))) {
+		if (user_itr && assoc->user) {
+			while ((tmp_char = list_next(user_itr))) {
+				if (!strcasecmp(tmp_char, assoc->user))
 					break;
 			}
 			list_iterator_reset(user_itr);
 			/* not correct user */
-			if(!tmp_char)
+			if (!tmp_char)
 				continue;
 		}
 
-		if(acct_itr) {
-			while((tmp_char = list_next(acct_itr))) {
-				if(!strcasecmp(tmp_char, assoc->acct))
+		if (acct_itr) {
+			while ((tmp_char = list_next(acct_itr))) {
+				if (!strcasecmp(tmp_char, assoc->acct))
 					break;
 			}
 			list_iterator_reset(acct_itr);
 			/* not correct account */
-			if(!tmp_char)
+			if (!tmp_char)
 				continue;
 		}
 
 		if (private_data & PRIVATE_DATA_USAGE) {
-			if(!is_admin) {
+			if (!is_admin) {
 				ListIterator itr = NULL;
 				slurmdb_coord_rec_t *coord = NULL;
 
-				if(assoc->user &&
-				   !strcmp(assoc->user, user.name))
+				if (assoc->user &&
+				    !strcmp(assoc->user, user.name))
 					goto is_user;
 
-				if(!user.coord_accts) {
+				if (!user.coord_accts) {
 					debug4("This user isn't a coord.");
 					goto bad_user;
 				}
 
-				if(!assoc->acct) {
+				if (!assoc->acct) {
 					debug("No account name given "
 					      "in association.");
 					goto bad_user;
 				}
 
 				itr = list_iterator_create(user.coord_accts);
-				while((coord = list_next(itr))) {
-					if(!strcasecmp(coord->name,
-						       assoc->acct))
+				while ((coord = list_next(itr))) {
+					if (!strcasecmp(coord->name,
+							assoc->acct))
 						break;
 				}
 				list_iterator_destroy(itr);
 
-				if(coord)
+				if (coord)
 					goto is_user;
 
 			bad_user:
@@ -2023,7 +2024,7 @@ extern List assoc_mgr_get_shares(void *db_conn,
 		share->assoc_id = assoc->id;
 		share->cluster = xstrdup(assoc->cluster);
 
-		if(assoc == assoc_mgr_root_assoc)
+		if (assoc == assoc_mgr_root_assoc)
 			share->shares_raw = NO_VAL;
 		else
 			share->shares_raw = assoc->shares_raw;
@@ -2031,11 +2032,11 @@ extern List assoc_mgr_get_shares(void *db_conn,
 		share->shares_norm = assoc->usage->shares_norm;
 		share->usage_raw = (uint64_t)assoc->usage->usage_raw;
 
-		if(assoc->user) {
+		if (assoc->user) {
 			/* We only calculate user effective usage when
 			 * we need it
 			 */
-			if(assoc->usage->usage_efctv == (long double)NO_VAL)
+			if (assoc->usage->usage_efctv == (long double)NO_VAL)
 				priority_g_set_assoc_usage(assoc);
 
 			share->name = xstrdup(assoc->user);
@@ -2043,8 +2044,8 @@ extern List assoc_mgr_get_shares(void *db_conn,
 			share->user = 1;
 		} else {
 			share->name = xstrdup(assoc->acct);
-			if(!assoc->parent_acct
-			   && assoc->usage->parent_assoc_ptr)
+			if (!assoc->parent_acct
+			    && assoc->usage->parent_assoc_ptr)
 				share->parent = xstrdup(
 					assoc->usage->parent_assoc_ptr->acct);
 			else
@@ -2056,9 +2057,9 @@ extern List assoc_mgr_get_shares(void *db_conn,
 	list_iterator_destroy(itr);
 	assoc_mgr_unlock(&locks);
 end_it:
-	if(user_itr)
+	if (user_itr)
 		list_iterator_destroy(user_itr);
-	if(acct_itr)
+	if (acct_itr)
 		list_iterator_destroy(acct_itr);
 
 	/* The ret_list should already be sorted correctly, so no need
@@ -2081,8 +2082,8 @@ extern int assoc_mgr_update(List update_list)
 
 	xassert(update_list);
 	itr = list_iterator_create(update_list);
-	while((object = list_next(itr))) {
-		if(!object->objects || !list_count(object->objects))
+	while ((object = list_next(itr))) {
+		if (!object->objects || !list_count(object->objects))
 			continue;
 
 		switch(object->type) {
@@ -2141,17 +2142,17 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
 	assoc_mgr_lock_t locks = { WRITE_LOCK, NO_LOCK,
 				   WRITE_LOCK, WRITE_LOCK, NO_LOCK };
 
-	if(!assoc_mgr_association_list)
+	if (!assoc_mgr_association_list)
 		return SLURM_SUCCESS;
 
 	assoc_mgr_lock(&locks);
 	itr = list_iterator_create(assoc_mgr_association_list);
-	while((object = list_pop(update->objects))) {
+	while ((object = list_pop(update->objects))) {
 		bool update_jobs = false;
 		if (object->cluster && assoc_mgr_cluster_name) {
 			/* only update the local clusters assocs */
-			if(strcasecmp(object->cluster,
-				      assoc_mgr_cluster_name)) {
+			if (strcasecmp(object->cluster,
+				       assoc_mgr_cluster_name)) {
 				slurmdb_destroy_association_rec(object);
 				continue;
 			}
@@ -2169,43 +2170,43 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
 		}
 
 		list_iterator_reset(itr);
-		while((rec = list_next(itr))) {
-			if(object->id) {
-				if(object->id == rec->id) {
+		while ((rec = list_next(itr))) {
+			if (object->id) {
+				if (object->id == rec->id) {
 					break;
 				}
 				continue;
 			} else {
-				if(!object->user && rec->user) {
+				if (!object->user && rec->user) {
 					debug4("we are looking for a "
 					       "nonuser association");
 					continue;
-				} else if(object->uid != rec->uid) {
+				} else if (object->uid != rec->uid) {
 					debug4("not the right user");
 					continue;
 				}
 
-				if(object->acct
-				   && (!rec->acct
-				       || strcasecmp(object->acct,
-						     rec->acct))) {
+				if (object->acct
+				    && (!rec->acct
+					|| strcasecmp(object->acct,
+						      rec->acct))) {
 					debug4("not the right account");
 					continue;
 				}
 
-				if(object->partition
-				   && (!rec->partition
-				       || strcasecmp(object->partition,
-						     rec->partition))) {
+				if (object->partition
+				    && (!rec->partition
+					|| strcasecmp(object->partition,
+						      rec->partition))) {
 					debug4("not the right partition");
 					continue;
 				}
 
 				/* only check for on the slurmdbd */
-				if(!assoc_mgr_cluster_name && object->cluster
-				   && (!rec->cluster
-				       || strcasecmp(object->cluster,
-						     rec->cluster))) {
+				if (!assoc_mgr_cluster_name && object->cluster
+				    && (!rec->cluster
+					|| strcasecmp(object->cluster,
+						      rec->cluster))) {
 					debug4("not the right cluster");
 					continue;
 				}
@@ -2215,12 +2216,12 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
 		//info("%d assoc %u", update->type, object->id);
 		switch(update->type) {
 		case SLURMDB_MODIFY_ASSOC:
-			if(!rec) {
+			if (!rec) {
 				rc = SLURM_ERROR;
 				break;
 			}
 
-			if(object->shares_raw != NO_VAL) {
+			if (object->shares_raw != NO_VAL) {
 				rec->shares_raw = object->shares_raw;
 				if (setup_children) {
 					/* we need to update the shares on
@@ -2231,60 +2232,60 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
 				}
 			}
 
-			if(object->grp_cpu_mins != (uint64_t)NO_VAL)
+			if (object->grp_cpu_mins != (uint64_t)NO_VAL)
 				rec->grp_cpu_mins = object->grp_cpu_mins;
-			if(object->grp_cpu_run_mins != (uint64_t)NO_VAL)
+			if (object->grp_cpu_run_mins != (uint64_t)NO_VAL)
 				rec->grp_cpu_run_mins =
 					object->grp_cpu_run_mins;
-			if(object->grp_cpus != NO_VAL) {
+			if (object->grp_cpus != NO_VAL) {
 				update_jobs = true;
 				rec->grp_cpus = object->grp_cpus;
 			}
-			if(object->grp_jobs != NO_VAL)
+			if (object->grp_jobs != NO_VAL)
 				rec->grp_jobs = object->grp_jobs;
-			if(object->grp_nodes != NO_VAL) {
+			if (object->grp_nodes != NO_VAL) {
 				update_jobs = true;
 				rec->grp_nodes = object->grp_nodes;
 			}
-			if(object->grp_submit_jobs != NO_VAL)
+			if (object->grp_submit_jobs != NO_VAL)
 				rec->grp_submit_jobs = object->grp_submit_jobs;
-			if(object->grp_wall != NO_VAL) {
+			if (object->grp_wall != NO_VAL) {
 				update_jobs = true;
 				rec->grp_wall = object->grp_wall;
 			}
 
-			if(object->lft != NO_VAL) {
+			if (object->lft != NO_VAL) {
 				rec->lft = object->lft;
 				resort = 1;
 			}
 
-			if(object->max_cpu_mins_pj != (uint64_t)NO_VAL)
+			if (object->max_cpu_mins_pj != (uint64_t)NO_VAL)
 				rec->max_cpu_mins_pj = object->max_cpu_mins_pj;
-			if(object->max_cpu_run_mins != (uint64_t)NO_VAL)
+			if (object->max_cpu_run_mins != (uint64_t)NO_VAL)
 				rec->max_cpu_run_mins =
 					object->max_cpu_run_mins;
-			if(object->max_cpus_pj != NO_VAL) {
+			if (object->max_cpus_pj != NO_VAL) {
 				update_jobs = true;
 				rec->max_cpus_pj = object->max_cpus_pj;
 			}
-			if(object->max_jobs != NO_VAL)
+			if (object->max_jobs != NO_VAL)
 				rec->max_jobs = object->max_jobs;
-			if(object->max_nodes_pj != NO_VAL) {
+			if (object->max_nodes_pj != NO_VAL) {
 				update_jobs = true;
 				rec->max_nodes_pj = object->max_nodes_pj;
 			}
-			if(object->max_submit_jobs != NO_VAL)
+			if (object->max_submit_jobs != NO_VAL)
 				rec->max_submit_jobs = object->max_submit_jobs;
-			if(object->max_wall_pj != NO_VAL) {
+			if (object->max_wall_pj != NO_VAL) {
 				update_jobs = true;
 				rec->max_wall_pj = object->max_wall_pj;
 			}
 
-			if(object->parent_acct) {
+			if (object->parent_acct) {
 				xfree(rec->parent_acct);
 				rec->parent_acct = xstrdup(object->parent_acct);
 			}
-			if(object->parent_id) {
+			if (object->parent_id) {
 				rec->parent_id = object->parent_id;
 				// after all new parents have been set we will
 				// reset the parent pointers below
@@ -2292,11 +2293,11 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
 			}
 			/* info("rec has def of %d %d", */
 			/*      rec->def_qos_id, object->def_qos_id); */
-			if(object->def_qos_id != NO_VAL)
+			if (object->def_qos_id != NO_VAL)
 				rec->def_qos_id = object->def_qos_id;
 
-			if(object->qos_list) {
-				if(rec->qos_list) {
+			if (object->qos_list) {
+				if (rec->qos_list) {
 					_local_update_assoc_qos_list(
 						rec, object->qos_list);
 				} else {
@@ -2304,10 +2305,10 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
 					object->qos_list = NULL;
 				}
 
-				if(rec->user && (g_qos_count > 0)) {
-					if(!rec->usage->valid_qos
-					   || (bit_size(rec->usage->valid_qos)
-					       != g_qos_count)) {
+				if (rec->user && (g_qos_count > 0)) {
+					if (!rec->usage->valid_qos
+					    || (bit_size(rec->usage->valid_qos)
+						!= g_qos_count)) {
 						FREE_NULL_BITMAP(
 							rec->usage->valid_qos);
 						rec->usage->valid_qos =
@@ -2325,17 +2326,17 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
 				}
 			}
 
-			if(rec->def_qos_id && rec->user
-			   && rec->usage && rec->usage->valid_qos
-			   && !bit_test(rec->usage->valid_qos,
-					rec->def_qos_id)) {
+			if (rec->def_qos_id && rec->user
+			    && rec->usage && rec->usage->valid_qos
+			    && !bit_test(rec->usage->valid_qos,
+					 rec->def_qos_id)) {
 				error("assoc %u doesn't have access "
 				      "to it's default %d",
 				      rec->id, rec->def_qos_id);
 				rec->def_qos_id = 0;
 			}
 
-			if(object->is_def != (uint16_t)NO_VAL) {
+			if (object->is_def != (uint16_t)NO_VAL) {
 				rec->is_def = object->is_def;
 				/* parents_changed will set this later
 				   so try to avoid doing it twice.
@@ -2362,12 +2363,12 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
 			}
 			break;
 		case SLURMDB_ADD_ASSOC:
-			if(rec) {
+			if (rec) {
 				//rc = SLURM_ERROR;
 				break;
 			}
 
-			if(!object->usage)
+			if (!object->usage)
 				object->usage =
 					create_assoc_mgr_association_usage();
 			list_append(assoc_mgr_association_list, object);
@@ -2379,7 +2380,7 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
 						 reservations */
 			break;
 		case SLURMDB_REMOVE_ASSOC:
-			if(!rec) {
+			if (!rec) {
 				//rc = SLURM_ERROR;
 				break;
 			}
@@ -2392,12 +2393,12 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
 							set the shares
 							of surrounding childern
 						     */
-			if(remove_assoc_notify) {
+			if (remove_assoc_notify) {
 				/* since there are some deadlock
 				   issues while inside our lock here
 				   we have to process a notify later
 				*/
-				if(!remove_list)
+				if (!remove_list)
 					remove_list = list_create(
 						slurmdb_destroy_association_rec);
 				list_remove(itr);
@@ -2406,7 +2407,7 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
 				list_delete_item(itr);
 			break;
 		case SLURMDB_REMOVE_ASSOC_USAGE:
-			if(!rec) {
+			if (!rec) {
 				//rc = SLURM_ERROR;
 				break;
 			}
@@ -2422,7 +2423,7 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
 	/* We have to do this after the entire list is processed since
 	 * we may have added the parent which wasn't in the list before
 	 */
-	if(parents_changed) {
+	if (parents_changed) {
 		int reset = 1;
 		slurmdb_sort_hierarchical_assoc_list(
 			assoc_mgr_association_list);
@@ -2430,18 +2431,18 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
 		list_iterator_reset(itr);
 		/* flush the childern lists */
 		if (setup_children) {
-			while((object = list_next(itr))) {
-				if(object->usage->childern_list)
+			while ((object = list_next(itr))) {
+				if (object->usage->childern_list)
 					list_flush(object->usage->
 						   childern_list);
 			}
 			list_iterator_reset(itr);
 		}
-		while((object = list_next(itr))) {
+		while ((object = list_next(itr))) {
 			/* reset the limits because since a parent
 			   changed we could have different usage
 			*/
-			if(!object->user) {
+			if (!object->user) {
 				_clear_used_info(object);
 				object->usage->usage_raw = 0;
 				object->usage->grp_used_wall = 0;
@@ -2458,27 +2459,27 @@ 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->childern_list ||
+				    !list_count(object->usage->childern_list))
 					goto is_user;
 				itr2 = list_iterator_create(
 					object->usage->childern_list);
-				while((rec = list_next(itr2)))
+				while ((rec = list_next(itr2)))
 					count += rec->shares_raw;
 				list_iterator_reset(itr2);
-				while((rec = list_next(itr2)))
+				while ((rec = list_next(itr2)))
 					rec->usage->level_shares = count;
 				list_iterator_destroy(itr2);
 			}
 		is_user:
-			if(!object->user)
+			if (!object->user)
 				continue;
 
 			rec = object;
 			/* look for a parent since we are starting at
 			   the parent instead of the child
 			*/
-			while(object->usage->parent_assoc_ptr) {
+			while (object->usage->parent_assoc_ptr) {
 				/* we need to get the parent first
 				   here since we start at the child
 				*/
@@ -2490,7 +2491,7 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
 		if (setup_children) {
 			/* Now normalize the static shares */
 			list_iterator_reset(itr);
-			while((object = list_next(itr))) {
+			while ((object = list_next(itr))) {
 				_normalize_assoc_shares(object);
 				log_assoc_rec(object, assoc_mgr_qos_list);
 			}
@@ -2536,51 +2537,51 @@ extern int assoc_mgr_update_wckeys(slurmdb_update_object_t *update)
 	assoc_mgr_lock_t locks = { NO_LOCK, NO_LOCK,
 				   NO_LOCK, WRITE_LOCK, WRITE_LOCK };
 
-	if(!assoc_mgr_wckey_list)
+	if (!assoc_mgr_wckey_list)
 		return SLURM_SUCCESS;
 
 	assoc_mgr_lock(&locks);
 	itr = list_iterator_create(assoc_mgr_wckey_list);
-	while((object = list_pop(update->objects))) {
-		if(object->cluster && assoc_mgr_cluster_name) {
+	while ((object = list_pop(update->objects))) {
+		if (object->cluster && assoc_mgr_cluster_name) {
 			/* only update the local clusters assocs */
-			if(strcasecmp(object->cluster,
-				      assoc_mgr_cluster_name)) {
+			if (strcasecmp(object->cluster,
+				       assoc_mgr_cluster_name)) {
 				slurmdb_destroy_wckey_rec(object);
 				continue;
 			}
-		} else if(assoc_mgr_cluster_name) {
+		} else if (assoc_mgr_cluster_name) {
 			error("We don't have a cluster here, no "
 			      "idea if this is our wckey.");
 			continue;
 		}
 
 		list_iterator_reset(itr);
-		while((rec = list_next(itr))) {
-			if(object->id) {
-				if(object->id == rec->id) {
+		while ((rec = list_next(itr))) {
+			if (object->id) {
+				if (object->id == rec->id) {
 					break;
 				}
 				continue;
 			} else {
-				if(object->uid != rec->uid) {
+				if (object->uid != rec->uid) {
 					debug4("not the right user");
 					continue;
 				}
 
-				if(object->name
-				   && (!rec->name
-				       || strcasecmp(object->name,
-						     rec->name))) {
+				if (object->name
+				    && (!rec->name
+					|| strcasecmp(object->name,
+						      rec->name))) {
 					debug4("not the right wckey");
 					continue;
 				}
 
 				/* only check for on the slurmdbd */
-				if(!assoc_mgr_cluster_name && object->cluster
-				   && (!rec->cluster
-				       || strcasecmp(object->cluster,
-						     rec->cluster))) {
+				if (!assoc_mgr_cluster_name && object->cluster
+				    && (!rec->cluster
+					|| strcasecmp(object->cluster,
+						      rec->cluster))) {
 					debug4("not the right cluster");
 					continue;
 				}
@@ -2590,7 +2591,7 @@ extern int assoc_mgr_update_wckeys(slurmdb_update_object_t *update)
 		//info("%d WCKEY %u", update->type, object->id);
 		switch(update->type) {
 		case SLURMDB_MODIFY_WCKEY:
-			if(!rec) {
+			if (!rec) {
 				rc = SLURM_ERROR;
 				break;
 			}
@@ -2603,7 +2604,7 @@ extern int assoc_mgr_update_wckeys(slurmdb_update_object_t *update)
 
 			break;
 		case SLURMDB_ADD_WCKEY:
-			if(rec) {
+			if (rec) {
 				//rc = SLURM_ERROR;
 				break;
 			}
@@ -2621,7 +2622,7 @@ extern int assoc_mgr_update_wckeys(slurmdb_update_object_t *update)
 			object = NULL;
 			break;
 		case SLURMDB_REMOVE_WCKEY:
-			if(!rec) {
+			if (!rec) {
 				//rc = SLURM_ERROR;
 				break;
 			}
@@ -2650,33 +2651,33 @@ extern int assoc_mgr_update_users(slurmdb_update_object_t *update)
 	assoc_mgr_lock_t locks = { WRITE_LOCK, NO_LOCK,
 				   NO_LOCK, WRITE_LOCK, WRITE_LOCK };
 
-	if(!assoc_mgr_user_list)
+	if (!assoc_mgr_user_list)
 		return SLURM_SUCCESS;
 
 	assoc_mgr_lock(&locks);
 	itr = list_iterator_create(assoc_mgr_user_list);
-	while((object = list_pop(update->objects))) {
+	while ((object = list_pop(update->objects))) {
 		list_iterator_reset(itr);
-		while((rec = list_next(itr))) {
+		while ((rec = list_next(itr))) {
 			char *name;
-			if(object->old_name)
+			if (object->old_name)
 				name = object->old_name;
 			else
 				name = object->name;
-			if(!strcasecmp(name, rec->name))
+			if (!strcasecmp(name, rec->name))
 				break;
 		}
 
 		//info("%d user %s", update->type, object->name);
 		switch(update->type) {
 		case SLURMDB_MODIFY_USER:
-			if(!rec) {
+			if (!rec) {
 				rc = SLURM_ERROR;
 				break;
 			}
 
-			if(object->old_name) {
-				if(!object->name) {
+			if (object->old_name) {
+				if (!object->name) {
 					error("Tried to alter user %s's name "
 					      "without giving a new one.",
 					      rec->name);
@@ -2701,12 +2702,12 @@ extern int assoc_mgr_update_users(slurmdb_update_object_t *update)
 				object->default_wckey = NULL;
 			}
 
-			if(object->admin_level != SLURMDB_ADMIN_NOTSET)
+			if (object->admin_level != SLURMDB_ADMIN_NOTSET)
 				rec->admin_level = object->admin_level;
 
 			break;
 		case SLURMDB_ADD_USER:
-			if(rec) {
+			if (rec) {
 				//rc = SLURM_ERROR;
 				break;
 			}
@@ -2720,7 +2721,7 @@ extern int assoc_mgr_update_users(slurmdb_update_object_t *update)
 			object = NULL;
 			break;
 		case SLURMDB_REMOVE_USER:
-			if(!rec) {
+			if (!rec) {
 				//rc = SLURM_ERROR;
 				break;
 			}
@@ -2729,16 +2730,16 @@ extern int assoc_mgr_update_users(slurmdb_update_object_t *update)
 		case SLURMDB_ADD_COORD:
 			/* same as SLURMDB_REMOVE_COORD */
 		case SLURMDB_REMOVE_COORD:
-			if(!rec) {
+			if (!rec) {
 				//rc = SLURM_ERROR;
 				break;
 			}
 			/* We always get a complete list here */
-			if(!object->coord_accts) {
-				if(rec->coord_accts)
+			if (!object->coord_accts) {
+				if (rec->coord_accts)
 					list_flush(rec->coord_accts);
 			} else {
-				if(rec->coord_accts)
+				if (rec->coord_accts)
 					list_destroy(rec->coord_accts);
 				rec->coord_accts = object->coord_accts;
 				object->coord_accts = NULL;
@@ -2771,16 +2772,16 @@ extern int assoc_mgr_update_qos(slurmdb_update_object_t *update)
 	assoc_mgr_lock_t locks = { WRITE_LOCK, NO_LOCK,
 				   WRITE_LOCK, NO_LOCK, NO_LOCK };
 
-	if(!assoc_mgr_qos_list)
+	if (!assoc_mgr_qos_list)
 		return SLURM_SUCCESS;
 
 	assoc_mgr_lock(&locks);
 	itr = list_iterator_create(assoc_mgr_qos_list);
-	while((object = list_pop(update->objects))) {
+	while ((object = list_pop(update->objects))) {
 		bool update_jobs = false;
 		list_iterator_reset(itr);
-		while((rec = list_next(itr))) {
-			if(object->id == rec->id) {
+		while ((rec = list_next(itr))) {
+			if (object->id == rec->id) {
 				break;
 			}
 		}
@@ -2788,12 +2789,12 @@ extern int assoc_mgr_update_qos(slurmdb_update_object_t *update)
 		//info("%d qos %s", update->type, object->name);
 		switch(update->type) {
 		case SLURMDB_ADD_QOS:
-			if(rec) {
+			if (rec) {
 				//rc = SLURM_ERROR;
 				break;
 			}
 
-			if(!object->usage)
+			if (!object->usage)
 				object->usage = create_assoc_mgr_qos_usage();
 			list_append(assoc_mgr_qos_list, object);
 /* 			char *tmp = get_qos_complete_str_bitstr( */
@@ -2808,19 +2809,19 @@ extern int assoc_mgr_update_qos(slurmdb_update_object_t *update)
 			   instead of 0 we need to ignore the 0 bit and start
 			   with 1 so increase the count by 1.
 			*/
-			if(object->id+1 > g_qos_count) {
+			if (object->id+1 > g_qos_count) {
 				resize_qos_bitstr = 1;
 				g_qos_count = object->id+1;
 			}
 			object = NULL;
 			break;
 		case SLURMDB_MODIFY_QOS:
-			if(!rec) {
+			if (!rec) {
 				rc = SLURM_ERROR;
 				break;
 			}
 
-			if(!(object->flags & QOS_FLAG_NOTSET)) {
+			if (!(object->flags & QOS_FLAG_NOTSET)) {
 				if (object->flags & QOS_FLAG_ADD) {
 					rec->flags |= object->flags;
 					rec->flags &= (~QOS_FLAG_ADD);
@@ -2831,53 +2832,53 @@ extern int assoc_mgr_update_qos(slurmdb_update_object_t *update)
 					rec->flags = object->flags;
 			}
 
-			if(object->grp_cpu_mins != (uint64_t)NO_VAL)
+			if (object->grp_cpu_mins != (uint64_t)NO_VAL)
 				rec->grp_cpu_mins = object->grp_cpu_mins;
-			if(object->grp_cpu_run_mins != (uint64_t)NO_VAL)
+			if (object->grp_cpu_run_mins != (uint64_t)NO_VAL)
 				rec->grp_cpu_run_mins =
 					object->grp_cpu_run_mins;
-			if(object->grp_cpus != NO_VAL) {
+			if (object->grp_cpus != NO_VAL) {
 				update_jobs = true;
 				rec->grp_cpus = object->grp_cpus;
 			}
-			if(object->grp_jobs != NO_VAL)
+			if (object->grp_jobs != NO_VAL)
 				rec->grp_jobs = object->grp_jobs;
-			if(object->grp_nodes != NO_VAL) {
+			if (object->grp_nodes != NO_VAL) {
 				update_jobs = true;
 				rec->grp_nodes = object->grp_nodes;
 			}
-			if(object->grp_submit_jobs != NO_VAL)
+			if (object->grp_submit_jobs != NO_VAL)
 				rec->grp_submit_jobs = object->grp_submit_jobs;
-			if(object->grp_wall != NO_VAL) {
+			if (object->grp_wall != NO_VAL) {
 				update_jobs = true;
 				rec->grp_wall = object->grp_wall;
 			}
 
-			if(object->max_cpu_mins_pj != (uint64_t)NO_VAL)
+			if (object->max_cpu_mins_pj != (uint64_t)NO_VAL)
 				rec->max_cpu_mins_pj = object->max_cpu_mins_pj;
-			if(object->max_cpu_run_mins_pu != (uint64_t)NO_VAL)
+			if (object->max_cpu_run_mins_pu != (uint64_t)NO_VAL)
 				rec->max_cpu_run_mins_pu =
 					object->max_cpu_run_mins_pu;
-			if(object->max_cpus_pj != NO_VAL) {
+			if (object->max_cpus_pj != NO_VAL) {
 				update_jobs = true;
 				rec->max_cpus_pj = object->max_cpus_pj;
 			}
-			if(object->max_jobs_pu != NO_VAL)
+			if (object->max_jobs_pu != NO_VAL)
 				rec->max_jobs_pu = object->max_jobs_pu;
-			if(object->max_nodes_pj != NO_VAL) {
+			if (object->max_nodes_pj != NO_VAL) {
 				update_jobs = true;
 				rec->max_nodes_pj = object->max_nodes_pj;
 			}
-			if(object->max_submit_jobs_pu != NO_VAL)
+			if (object->max_submit_jobs_pu != NO_VAL)
 				rec->max_submit_jobs_pu =
 					object->max_submit_jobs_pu;
-			if(object->max_wall_pj != NO_VAL) {
+			if (object->max_wall_pj != NO_VAL) {
 				update_jobs = true;
 				rec->max_wall_pj = object->max_wall_pj;
 			}
 
-			if(object->preempt_bitstr) {
-				if(rec->preempt_bitstr)
+			if (object->preempt_bitstr) {
+				if (rec->preempt_bitstr)
 					FREE_NULL_BITMAP(rec->preempt_bitstr);
 
 				rec->preempt_bitstr = object->preempt_bitstr;
@@ -2891,17 +2892,17 @@ extern int assoc_mgr_update_qos(slurmdb_update_object_t *update)
 /* 				xfree(tmp); */
 			}
 
-			if(object->preempt_mode != (uint16_t)NO_VAL)
+			if (object->preempt_mode != (uint16_t)NO_VAL)
 				rec->preempt_mode = object->preempt_mode;
 
-			if(object->priority != NO_VAL)
+			if (object->priority != NO_VAL)
 				rec->priority = object->priority;
 
-			if(object->usage_factor != (double)NO_VAL)
+			if (object->usage_factor != (double)NO_VAL)
 				rec->usage_factor =
 					object->usage_factor;
 
-			if(object->usage_thres != (double)NO_VAL)
+			if (object->usage_thres != (double)NO_VAL)
 				rec->usage_thres = object->usage_thres;
 
 			if (update_jobs && update_qos_notify) {
@@ -2916,17 +2917,17 @@ extern int assoc_mgr_update_qos(slurmdb_update_object_t *update)
 
 			break;
 		case SLURMDB_REMOVE_QOS:
-			if(!rec) {
+			if (!rec) {
 				//rc = SLURM_ERROR;
 				break;
 			}
 
-			if(remove_qos_notify) {
+			if (remove_qos_notify) {
 				/* since there are some deadlock
 				   issues while inside our lock here
 				   we have to process a notify later
 				*/
-				if(!remove_list)
+				if (!remove_list)
 					remove_list = list_create(
 						slurmdb_destroy_qos_rec);
 				list_remove(itr);
@@ -2934,23 +2935,23 @@ extern int assoc_mgr_update_qos(slurmdb_update_object_t *update)
 			} else
 				list_delete_item(itr);
 
-			if(!assoc_mgr_association_list)
+			if (!assoc_mgr_association_list)
 				break;
 			/* Remove this qos from all the associations
 			   on this cluster.
 			*/
 			assoc_itr = list_iterator_create(
 				assoc_mgr_association_list);
-			while((assoc = list_next(assoc_itr))) {
+			while ((assoc = list_next(assoc_itr))) {
 
-				if(assoc->def_qos_id == object->id)
+				if (assoc->def_qos_id == object->id)
 					assoc->def_qos_id = 0;
 
-				if(!assoc->usage->valid_qos)
+				if (!assoc->usage->valid_qos)
 					continue;
 
-				if(bit_size(assoc->usage->valid_qos)
-				   > object->id)
+				if (bit_size(assoc->usage->valid_qos)
+				    > object->id)
 					bit_clear(assoc->usage->valid_qos,
 						  object->id);
 			}
@@ -2963,23 +2964,23 @@ extern int assoc_mgr_update_qos(slurmdb_update_object_t *update)
 		slurmdb_destroy_qos_rec(object);
 	}
 
-	if(resize_qos_bitstr) {
+	if (resize_qos_bitstr) {
 		/* we need to resize all bitstring's that represent
 		   qos' */
 		list_iterator_reset(itr);
-		while((object = list_next(itr))) {
-			if(!object->preempt_bitstr)
+		while ((object = list_next(itr))) {
+			if (!object->preempt_bitstr)
 				continue;
 
 			object->preempt_bitstr =
 				bit_realloc(object->preempt_bitstr,
 					    g_qos_count);
 		}
-		if(assoc_mgr_association_list) {
+		if (assoc_mgr_association_list) {
 			assoc_itr = list_iterator_create(
 				assoc_mgr_association_list);
-			while((assoc = list_next(assoc_itr))) {
-				if(!assoc->usage->valid_qos)
+			while ((assoc = list_next(assoc_itr))) {
+				if (!assoc->usage->valid_qos)
 					continue;
 				assoc->usage->valid_qos =
 					bit_realloc(assoc->usage->valid_qos,
@@ -2996,7 +2997,7 @@ extern int assoc_mgr_update_qos(slurmdb_update_object_t *update)
 	   assoc_mgr_lock */
 	if (remove_list) {
 		itr = list_iterator_create(remove_list);
-		while((rec = list_next(itr)))
+		while ((rec = list_next(itr)))
 			remove_qos_notify(rec);
 		list_iterator_destroy(itr);
 		list_destroy(remove_list);
@@ -3004,7 +3005,7 @@ extern int assoc_mgr_update_qos(slurmdb_update_object_t *update)
 
 	if (update_list) {
 		itr = list_iterator_create(update_list);
-		while((rec = list_next(itr)))
+		while ((rec = list_next(itr)))
 			update_qos_notify(rec);
 		list_iterator_destroy(itr);
 		list_destroy(update_list);
@@ -3022,26 +3023,26 @@ extern int assoc_mgr_validate_assoc_id(void *db_conn,
 	assoc_mgr_lock_t locks = { READ_LOCK, NO_LOCK,
 				   NO_LOCK, NO_LOCK, NO_LOCK };
 
-	if(!assoc_mgr_association_list)
-		if(_get_assoc_mgr_association_list(db_conn, enforce)
-		   == SLURM_ERROR)
+	if (!assoc_mgr_association_list)
+		if (_get_assoc_mgr_association_list(db_conn, enforce)
+		    == SLURM_ERROR)
 			return SLURM_ERROR;
 
-	if((!assoc_mgr_association_list
-	    || !list_count(assoc_mgr_association_list))
-	   && !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
+	if ((!assoc_mgr_association_list
+	     || !list_count(assoc_mgr_association_list))
+	    && !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
 		return SLURM_SUCCESS;
 
 	assoc_mgr_lock(&locks);
 	itr = list_iterator_create(assoc_mgr_association_list);
-	while((found_assoc = list_next(itr))) {
-		if(assoc_id == found_assoc->id)
+	while ((found_assoc = list_next(itr))) {
+		if (assoc_id == found_assoc->id)
 			break;
 	}
 	list_iterator_destroy(itr);
 	assoc_mgr_unlock(&locks);
 
-	if(found_assoc || !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
+	if (found_assoc || !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
 		return SLURM_SUCCESS;
 
 	return SLURM_ERROR;
@@ -3059,7 +3060,7 @@ extern void assoc_mgr_clear_used_info(void)
 
 	assoc_mgr_lock(&locks);
 	itr = list_iterator_create(assoc_mgr_association_list);
-	while((found_assoc = list_next(itr))) {
+	while ((found_assoc = list_next(itr))) {
 		_clear_used_info(found_assoc);
 	}
 	list_iterator_destroy(itr);
@@ -3071,11 +3072,11 @@ static void _reset_children_usages(List childern_list)
 	slurmdb_association_rec_t *assoc = NULL;
 	ListIterator itr = NULL;
 
-	if(!childern_list || !list_count(childern_list))
+	if (!childern_list || !list_count(childern_list))
 		return;
 
 	itr = list_iterator_create(childern_list);
-	while((assoc = list_next(itr))) {
+	while ((assoc = list_next(itr))) {
 		assoc->usage->usage_raw = 0.0;
 		assoc->usage->grp_used_wall = 0.0;
 		if (assoc->user)
@@ -3148,7 +3149,7 @@ extern int dump_assoc_mgr_state(char *state_save_location)
 	pack_time(time(NULL), buffer);
 
 	assoc_mgr_lock(&locks);
-	if(assoc_mgr_user_list) {
+	if (assoc_mgr_user_list) {
 		memset(&msg, 0, sizeof(dbd_list_msg_t));
 		msg.my_list = assoc_mgr_user_list;
 		/* let us know what to unpack */
@@ -3157,7 +3158,7 @@ extern int dump_assoc_mgr_state(char *state_save_location)
 				       DBD_ADD_USERS, buffer);
 	}
 
-	if(assoc_mgr_qos_list) {
+	if (assoc_mgr_qos_list) {
 		memset(&msg, 0, sizeof(dbd_list_msg_t));
 		msg.my_list = assoc_mgr_qos_list;
 		/* let us know what to unpack */
@@ -3166,7 +3167,7 @@ extern int dump_assoc_mgr_state(char *state_save_location)
 				       DBD_ADD_QOS, buffer);
 	}
 
-	if(assoc_mgr_wckey_list) {
+	if (assoc_mgr_wckey_list) {
 		memset(&msg, 0, sizeof(dbd_list_msg_t));
 		msg.my_list = assoc_mgr_wckey_list;
 		/* let us know what to unpack */
@@ -3176,7 +3177,7 @@ extern int dump_assoc_mgr_state(char *state_save_location)
 	}
 	/* this needs to be done last so qos is set up
 	 * before hand when loading it back */
-	if(assoc_mgr_association_list) {
+	if (assoc_mgr_association_list) {
 		memset(&msg, 0, sizeof(dbd_list_msg_t));
 		msg.my_list = assoc_mgr_association_list;
 		/* let us know what to unpack */
@@ -3216,11 +3217,11 @@ extern int dump_assoc_mgr_state(char *state_save_location)
 		(void) unlink(new_file);
 	else {			/* file shuffle */
 		(void) unlink(old_file);
-		if(link(reg_file, old_file))
+		if (link(reg_file, old_file))
 			debug4("unable to create link for %s -> %s: %m",
 			       reg_file, old_file);
 		(void) unlink(reg_file);
-		if(link(new_file, reg_file))
+		if (link(new_file, reg_file))
 			debug4("unable to create link for %s -> %s: %m",
 			       new_file, reg_file);
 		(void) unlink(new_file);
@@ -3237,12 +3238,12 @@ extern int dump_assoc_mgr_state(char *state_save_location)
 	pack16(ASSOC_USAGE_VERSION, buffer);
 	pack_time(time(NULL), buffer);
 
-	if(assoc_mgr_association_list) {
+	if (assoc_mgr_association_list) {
 		ListIterator itr = NULL;
 		slurmdb_association_rec_t *assoc = NULL;
 		itr = list_iterator_create(assoc_mgr_association_list);
-		while((assoc = list_next(itr))) {
-			if(!assoc->user)
+		while ((assoc = list_next(itr))) {
+			if (!assoc->user)
 				continue;
 
 			pack32(assoc->id, buffer);
@@ -3285,11 +3286,11 @@ extern int dump_assoc_mgr_state(char *state_save_location)
 		(void) unlink(new_file);
 	else {			/* file shuffle */
 		(void) unlink(old_file);
-		if(link(reg_file, old_file))
+		if (link(reg_file, old_file))
 			debug4("unable to create link for %s -> %s: %m",
 			       reg_file, old_file);
 		(void) unlink(reg_file);
-		if(link(new_file, reg_file))
+		if (link(new_file, reg_file))
 			debug4("unable to create link for %s -> %s: %m",
 			       new_file, reg_file);
 		(void) unlink(new_file);
@@ -3306,11 +3307,11 @@ extern int dump_assoc_mgr_state(char *state_save_location)
 	pack16(ASSOC_USAGE_VERSION, buffer);
 	pack_time(time(NULL), buffer);
 
-	if(assoc_mgr_qos_list) {
+	if (assoc_mgr_qos_list) {
 		ListIterator itr = NULL;
 		slurmdb_qos_rec_t *qos = NULL;
 		itr = list_iterator_create(assoc_mgr_qos_list);
-		while((qos = list_next(itr))) {
+		while ((qos = list_next(itr))) {
 			pack32(qos->id, buffer);
 			/* we only care about the main part here so
 			   anything under 1 we are dropping
@@ -3351,11 +3352,11 @@ extern int dump_assoc_mgr_state(char *state_save_location)
 		(void) unlink(new_file);
 	else {			/* file shuffle */
 		(void) unlink(old_file);
-		if(link(reg_file, old_file))
+		if (link(reg_file, old_file))
 			debug4("unable to create link for %s -> %s: %m",
 			       reg_file, old_file);
 		(void) unlink(reg_file);
-		if(link(new_file, reg_file))
+		if (link(new_file, reg_file))
 			debug4("unable to create link for %s -> %s: %m",
 			       new_file, reg_file);
 		(void) unlink(new_file);
@@ -3384,7 +3385,7 @@ extern int load_assoc_usage(char *state_save_location)
 	assoc_mgr_lock_t locks = { WRITE_LOCK, READ_LOCK,
 				   NO_LOCK, NO_LOCK, NO_LOCK };
 
-	if(!assoc_mgr_association_list)
+	if (!assoc_mgr_association_list)
 		return SLURM_SUCCESS;
 
 	/* read the file */
@@ -3446,8 +3447,8 @@ extern int load_assoc_usage(char *state_save_location)
 		safe_unpack32(&assoc_id, buffer);
 		safe_unpack64(&usage_raw, buffer);
 		safe_unpack32(&grp_used_wall, buffer);
-		while((assoc = list_next(itr)))
-			if(assoc->id == assoc_id)
+		while ((assoc = list_next(itr)))
+			if (assoc->id == assoc_id)
 				break;
 
 		/* We want to do this all the way up to and including
@@ -3455,7 +3456,7 @@ extern int load_assoc_usage(char *state_save_location)
 		   has occured on the entire system and use that to
 		   normalize against.
 		*/
-		while(assoc) {
+		while (assoc) {
 			assoc->usage->grp_used_wall += grp_used_wall;
 			assoc->usage->usage_raw += (long double)usage_raw;
 
@@ -3470,9 +3471,9 @@ extern int load_assoc_usage(char *state_save_location)
 	return SLURM_SUCCESS;
 
 unpack_error:
-	if(buffer)
+	if (buffer)
 		free_buf(buffer);
-	if(itr)
+	if (itr)
 		list_iterator_destroy(itr);
 	assoc_mgr_unlock(&locks);
 	return SLURM_ERROR;
@@ -3491,7 +3492,7 @@ extern int load_qos_usage(char *state_save_location)
 	assoc_mgr_lock_t locks = { NO_LOCK, READ_LOCK,
 				   WRITE_LOCK, NO_LOCK, NO_LOCK };
 
-	if(!assoc_mgr_qos_list)
+	if (!assoc_mgr_qos_list)
 		return SLURM_SUCCESS;
 
 	/* read the file */
@@ -3553,10 +3554,10 @@ extern int load_qos_usage(char *state_save_location)
 		safe_unpack32(&qos_id, buffer);
 		safe_unpack64(&usage_raw, buffer);
 		safe_unpack32(&grp_used_wall, buffer);
-		while((qos = list_next(itr)))
-			if(qos->id == qos_id)
+		while ((qos = list_next(itr)))
+			if (qos->id == qos_id)
 				break;
-		if(qos) {
+		if (qos) {
 			qos->usage->grp_used_wall += grp_used_wall;
 			qos->usage->usage_raw += (long double)usage_raw;
 		}
@@ -3570,9 +3571,9 @@ extern int load_qos_usage(char *state_save_location)
 	return SLURM_SUCCESS;
 
 unpack_error:
-	if(buffer)
+	if (buffer)
 		free_buf(buffer);
-	if(itr)
+	if (itr)
 		list_iterator_destroy(itr);
 	assoc_mgr_unlock(&locks);
 	return SLURM_ERROR;
@@ -3690,7 +3691,7 @@ extern int load_assoc_mgr_state(char *state_save_location)
 				error("No qos retrieved");
 				break;
 			}
-			if(assoc_mgr_qos_list)
+			if (assoc_mgr_qos_list)
 				list_destroy(assoc_mgr_qos_list);
 			assoc_mgr_qos_list = msg->my_list;
 			_post_qos_list(assoc_mgr_qos_list);
@@ -3739,30 +3740,30 @@ extern int assoc_mgr_refresh_lists(void *db_conn, assoc_init_args_t *args)
 	static uint16_t enforce = 0;
 	static uint16_t cache_level = ASSOC_MGR_CACHE_ALL;
 
-	if(args) {
+	if (args) {
 		enforce = args->enforce;
 		cache_level = args->cache_level;
 		return SLURM_SUCCESS;
 	}
 
 	/* get qos before association since it is used there */
-	if(cache_level & ASSOC_MGR_CACHE_QOS)
-		if(_refresh_assoc_mgr_qos_list(db_conn, enforce) == SLURM_ERROR)
+	if (cache_level & ASSOC_MGR_CACHE_QOS)
+		if (_refresh_assoc_mgr_qos_list(db_conn, enforce) == SLURM_ERROR)
 			return SLURM_ERROR;
 
 	/* get user before association/wckey since it is used there */
-	if(cache_level & ASSOC_MGR_CACHE_USER)
-		if(_refresh_assoc_mgr_user_list(db_conn, enforce)
-		   == SLURM_ERROR)
+	if (cache_level & ASSOC_MGR_CACHE_USER)
+		if (_refresh_assoc_mgr_user_list(db_conn, enforce)
+		    == SLURM_ERROR)
 			return SLURM_ERROR;
 
-	if(cache_level & ASSOC_MGR_CACHE_ASSOC) {
-		if(_refresh_assoc_mgr_association_list(db_conn, enforce)
-		   == SLURM_ERROR)
+	if (cache_level & ASSOC_MGR_CACHE_ASSOC) {
+		if (_refresh_assoc_mgr_association_list(db_conn, enforce)
+		    == SLURM_ERROR)
 			return SLURM_ERROR;
 	}
-	if(cache_level & ASSOC_MGR_CACHE_WCKEY)
-		if(_refresh_assoc_wckey_list(db_conn, enforce) == SLURM_ERROR)
+	if (cache_level & ASSOC_MGR_CACHE_WCKEY)
+		if (_refresh_assoc_wckey_list(db_conn, enforce) == SLURM_ERROR)
 			return SLURM_ERROR;
 
 	running_cache = 0;
@@ -3778,11 +3779,11 @@ extern int assoc_mgr_set_missing_uids()
 				   NO_LOCK, WRITE_LOCK, WRITE_LOCK };
 
 	assoc_mgr_lock(&locks);
-	if(assoc_mgr_association_list) {
+	if (assoc_mgr_association_list) {
 		slurmdb_association_rec_t *object = NULL;
 		itr = list_iterator_create(assoc_mgr_association_list);
-		while((object = list_next(itr))) {
-			if(object->user && (object->uid == NO_VAL)) {
+		while ((object = list_next(itr))) {
+			if (object->user && (object->uid == NO_VAL)) {
 				if (uid_from_string(
 					    object->user, &pw_uid) < 0) {
 					debug2("refresh association "
@@ -3795,11 +3796,11 @@ extern int assoc_mgr_set_missing_uids()
 		list_iterator_destroy(itr);
 	}
 
-	if(assoc_mgr_wckey_list) {
+	if (assoc_mgr_wckey_list) {
 		slurmdb_wckey_rec_t *object = NULL;
 		itr = list_iterator_create(assoc_mgr_wckey_list);
-		while((object = list_next(itr))) {
-			if(object->user && (object->uid == NO_VAL)) {
+		while ((object = list_next(itr))) {
+			if (object->user && (object->uid == NO_VAL)) {
 				if (uid_from_string(
 					    object->user, &pw_uid) < 0) {
 					debug2("refresh wckey "
@@ -3812,11 +3813,11 @@ extern int assoc_mgr_set_missing_uids()
 		list_iterator_destroy(itr);
 	}
 
-	if(assoc_mgr_user_list) {
+	if (assoc_mgr_user_list) {
 		slurmdb_user_rec_t *object = NULL;
 		itr = list_iterator_create(assoc_mgr_user_list);
-		while((object = list_next(itr))) {
-			if(object->name && (object->uid == NO_VAL)) {
+		while ((object = list_next(itr))) {
+			if (object->name && (object->uid == NO_VAL)) {
 				if (uid_from_string(
 					    object->name, &pw_uid) < 0) {
 					debug3("refresh user couldn't get "
-- 
GitLab