From 62b1d9affa647d11ac768fc5260b9d909f2cc80f Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Fri, 30 Jul 2010 20:34:57 +0000
Subject: [PATCH] removed extra \n's
---
doc/man/man5/slurm.conf.5 | 2 +-
src/plugins/select/bluegene/block_allocator/block_allocator.c | 4 ++--
src/plugins/select/bluegene/block_allocator/bridge_linker.c | 4 ++--
src/plugins/select/bluegene/plugin/bg_job_run.c | 4 ++--
src/plugins/select/bluegene/plugin/bg_record_functions.c | 2 +-
src/plugins/select/bluegene/plugin/block_sys.c | 4 ++--
src/plugins/select/bluegene/plugin/bluegene.c | 4 ++--
src/plugins/select/bluegene/plugin/defined_block.c | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index 1bdd5c8e9c4..27c1276db8d 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -1315,7 +1315,7 @@ Multiple options may be comma separated.
.TP
\fBdefer\fR
Setting this option will avoid attempting to schedule each job
-individually at job submit time, but defer it until a later time when
+individually at job submit time, but defer it until a later time when
scheduling multiple jobs simultaneously may be possible.
This option may improve system responsiveness when large numbers of jobs
(many hundreds) are submitted at the same time, but it will delay the
diff --git a/src/plugins/select/bluegene/block_allocator/block_allocator.c b/src/plugins/select/bluegene/block_allocator/block_allocator.c
index d4a25b90da4..ec715cb05ca 100644
--- a/src/plugins/select/bluegene/block_allocator/block_allocator.c
+++ b/src/plugins/select/bluegene/block_allocator/block_allocator.c
@@ -2209,7 +2209,7 @@ extern int load_block_wiring(char *bg_block_id)
int *geo = NULL;
if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
- info("getting info for block %s\n", bg_block_id);
+ info("getting info for block %s", bg_block_id);
if ((rc = bridge_get_block(bg_block_id, &block_ptr)) != STATUS_OK) {
error("bridge_get_block(%s): %s",
@@ -2439,7 +2439,7 @@ extern List get_and_set_block_wiring(char *bg_block_id,
ListIterator itr = NULL;
if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
- info("getting info for block %s\n", bg_block_id);
+ info("getting info for block %s", bg_block_id);
if ((rc = bridge_get_data(block_ptr, RM_PartitionSwitchNum,
&switch_cnt)) != STATUS_OK) {
diff --git a/src/plugins/select/bluegene/block_allocator/bridge_linker.c b/src/plugins/select/bluegene/block_allocator/bridge_linker.c
index 29b46e4e89d..185ae72663e 100644
--- a/src/plugins/select/bluegene/block_allocator/bridge_linker.c
+++ b/src/plugins/select/bluegene/block_allocator/bridge_linker.c
@@ -113,7 +113,7 @@ int _get_syms(int n_syms, const char *names[], void *ptrs[])
db_handle = dlopen (BG_DB2_SO, RTLD_LAZY);
if (!db_handle) {
have_db2 = false;
- debug("%s\n", dlerror());
+ debug("%s", dlerror());
return 0;
}
dlclose(db_handle);
@@ -126,7 +126,7 @@ int _get_syms(int n_syms, const char *names[], void *ptrs[])
handle = dlopen (BG_BRIDGE_SO, RTLD_LAZY);
if (!handle) {
have_db2 = false;
- debug("%s\n", dlerror());
+ debug("%s", dlerror());
return 0;
}
#else
diff --git a/src/plugins/select/bluegene/plugin/bg_job_run.c b/src/plugins/select/bluegene/plugin/bg_job_run.c
index 4cc79a9fa6b..fa16a3e6a8f 100644
--- a/src/plugins/select/bluegene/plugin/bg_job_run.c
+++ b/src/plugins/select/bluegene/plugin/bg_job_run.c
@@ -381,7 +381,7 @@ static void _remove_jobs_on_block_and_reset(rm_job_list_t *job_list,
}
if(!job_elem) {
- error("No Job Elem breaking out job count = %d\n", i);
+ error("No Job Elem breaking out job count = %d", i);
break;
}
if ((rc = bridge_get_data(job_elem, RM_JobPartitionID,
@@ -397,7 +397,7 @@ static void _remove_jobs_on_block_and_reset(rm_job_list_t *job_list,
continue;
}
- debug2("looking at block %s looking for %s\n",
+ debug2("looking at block %s looking for %s",
job_block, block_id);
if (strcmp(job_block, block_id)) {
diff --git a/src/plugins/select/bluegene/plugin/bg_record_functions.c b/src/plugins/select/bluegene/plugin/bg_record_functions.c
index cf5f5f7e756..8dcf31f4c71 100644
--- a/src/plugins/select/bluegene/plugin/bg_record_functions.c
+++ b/src/plugins/select/bluegene/plugin/bg_record_functions.c
@@ -333,7 +333,7 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
}
list_iterator_destroy(itr);
debug3("process_nodes: "
- "geo = %c%c%c bp count is %d start is %c%c%c\n",
+ "geo = %c%c%c bp count is %d start is %c%c%c",
alpha_num[bg_record->geo[X]],
alpha_num[bg_record->geo[Y]],
alpha_num[bg_record->geo[Z]],
diff --git a/src/plugins/select/bluegene/plugin/block_sys.c b/src/plugins/select/bluegene/plugin/block_sys.c
index 4cc32321e80..46c4a2982c8 100755
--- a/src/plugins/select/bluegene/plugin/block_sys.c
+++ b/src/plugins/select/bluegene/plugin/block_sys.c
@@ -183,7 +183,7 @@ static int _post_allocate(bg_record_t *bg_record)
uid_t my_uid;
/* Add partition record to the DB */
- debug2("adding block\n");
+ debug2("adding block");
for(i=0;i<MAX_ADD_RETRY; i++) {
if ((rc = bridge_add_block(bg_record->bg_block))
@@ -203,7 +203,7 @@ static int _post_allocate(bg_record_t *bg_record)
error("bridge_free_block(): %s", bg_err_str(rc));
fatal("couldn't add last block.");
}
- debug2("done adding\n");
+ debug2("done adding");
/* Get back the new block id */
if ((rc = bridge_get_data(bg_record->bg_block, RM_PartitionID,
diff --git a/src/plugins/select/bluegene/plugin/bluegene.c b/src/plugins/select/bluegene/plugin/bluegene.c
index bda12814ef2..30f1558a9b0 100644
--- a/src/plugins/select/bluegene/plugin/bluegene.c
+++ b/src/plugins/select/bluegene/plugin/bluegene.c
@@ -627,7 +627,7 @@ extern void *mult_destroy_block(void *args)
}
slurm_mutex_unlock(&block_state_mutex);
if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
- info("removing the jobs on block %s\n",
+ info("removing the jobs on block %s",
bg_record->bg_block_id);
term_jobs_on_block(bg_record->bg_block_id);
@@ -1692,7 +1692,7 @@ static int _reopen_bridge_log(void)
bg_conf->bridge_api_verb);
#endif
if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
- info("Bridge api file set to %s, verbose level %d\n",
+ info("Bridge api file set to %s, verbose level %d",
bg_conf->bridge_api_file, bg_conf->bridge_api_verb);
return rc;
diff --git a/src/plugins/select/bluegene/plugin/defined_block.c b/src/plugins/select/bluegene/plugin/defined_block.c
index 55bdc88ed81..71c015015a7 100644
--- a/src/plugins/select/bluegene/plugin/defined_block.c
+++ b/src/plugins/select/bluegene/plugin/defined_block.c
@@ -102,7 +102,7 @@ extern int create_defined_blocks(bg_layout_t overlapped,
bg_found_block_list);
while ((found_record = (bg_record_t*)
list_next(itr_found)) != NULL) {
-/* info("%s[%s] ?= %s[%s]\n", */
+/* info("%s[%s] ?= %s[%s]", */
/* bg_record->nodes, */
/* bg_record->ionodes, */
/* found_record->nodes, */
--
GitLab