Skip to content

Commit 0738caf

Browse files
ernst-bablickernst-bablick
committed
BF: CS-1236: Message file contains empty lines
1 parent d1a293c commit 0738caf

File tree

11 files changed

+23
-24
lines changed

11 files changed

+23
-24
lines changed

‎source/clients/qevent/ocs_qevent.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,19 +309,19 @@ static void qevent_start_trigger_script(int qevent_event, const char* script_fil
309309

310310
/* test if script is executable and valid file */
311311
if (!sge_is_file(script_file)) {
312-
ERROR("no script file: " SFQ "\n", script_file);
312+
ERROR("no script file: " SFQ, script_file);
313313
DRETURN_VOID;
314314
}
315315

316316
/* is file executable ? */
317317
if (!sge_is_executable(script_file)) {
318-
ERROR("file not executable: " SFQ "\n", script_file);
318+
ERROR("file not executable: " SFQ, script_file);
319319
DRETURN_VOID;
320320
}
321321

322322
pid = fork();
323323
if (pid < 0) {
324-
ERROR("fork() error\n");
324+
ERROR("fork() error");
325325
DRETURN_VOID;
326326
}
327327

‎source/daemons/execd/execd.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ int main(int argc, char **argv)
388388
/* log if we received SIGPIPE signal */
389389
if (sge_sig_handler_sigpipe_received) {
390390
sge_sig_handler_sigpipe_received = 0;
391-
INFO("SIGPIPE received\n");
391+
INFO("SIGPIPE received");
392392
}
393393

394394
#if defined(LINUX)

‎source/daemons/execd/reaper_execd.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1236,7 +1236,7 @@ cleanup_jobs_and_states(bool startup, int number_of_shpeherd, pid_t *shepherd_pi
12361236
char path[SGE_PATH_MAX];
12371237
snprintf(path, sizeof(path), ACTIVE_DIR"/%s", job_directory);
12381238
sge_rmdir(path, nullptr);
1239-
INFO("removed active jobs directory %s\n", path);
1239+
INFO("removed active jobs directory %s", path);
12401240
}
12411241
} else {
12421242

‎source/daemons/qmaster/ocs_ReportingFileWriter.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ namespace ocs {
443443
/* valid input data? */
444444
if (job == nullptr || ja_task == nullptr) {
445445
/* @todo I18N */
446-
WARNING("reporting_is_intermediate_acct_required: invalid input data\n");
446+
WARNING("reporting_is_intermediate_acct_required: invalid input data");
447447
DRETURN(false);
448448
}
449449

‎source/daemons/qmaster/sge_utility_qmaster.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -634,12 +634,12 @@ attr_mod_sub_list(lList **alpp, lListElem *this_elem, int this_elem_name, int th
634634

635635
if (ret) {
636636
if (!no_info && sub_cmd & ocs::gdi::SubCommand::SGE_GDI_REMOVE) {
637-
INFO(SFQ " does not exist in " SFQ " of " SFQ "\n", rstring, sub_list_name, object_name);
637+
INFO(SFQ " does not exist in " SFQ " of " SFQ, rstring, sub_list_name, object_name);
638638
answer_list_add(alpp, SGE_EVENT, STATUS_OK, ANSWER_QUALITY_INFO);
639639
} else {
640640
if (!full_sublist) {
641641
if (!no_info && sub_cmd & ocs::gdi::SubCommand::SGE_GDI_CHANGE) {
642-
INFO(SFQ " of " SFQ " is empty - Adding new element(s).\n", sub_list_name, object_name);
642+
INFO(SFQ " of " SFQ " is empty - Adding new element(s).", sub_list_name, object_name);
643643
answer_list_add(alpp, SGE_EVENT, STATUS_OK, ANSWER_QUALITY_INFO);
644644
}
645645
lSetList(this_elem, this_elem_name, lCopyList("", lGetList(delta_elem, this_elem_name)));
@@ -649,7 +649,7 @@ attr_mod_sub_list(lList **alpp, lListElem *this_elem, int this_elem_name, int th
649649
break;
650650
} else {
651651
if (!no_info && sub_cmd & ocs::gdi::SubCommand::SGE_GDI_CHANGE) {
652-
INFO("Unable to find " SFQ " in " SFQ " of " SFQ " - Adding new element.\n", rstring, sub_list_name, object_name);
652+
INFO("Unable to find " SFQ " in " SFQ " of " SFQ " - Adding new element.", rstring, sub_list_name, object_name);
653653
answer_list_add(alpp, SGE_EVENT, STATUS_OK, ANSWER_QUALITY_INFO);
654654
}
655655
new_sub_elem = lDechainElem(reduced_sublist, reduced_element);

‎source/libs/evc/sge_event_client.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1475,13 +1475,13 @@ ec2_register(sge_evc_class_t *thiz, bool exit_on_qmaster_down, lList** alpp) {
14751475
if (ngc_error == CL_RETVAL_OK) {
14761476
DPRINTF("closed old connection to qmaster\n");
14771477
} else {
1478-
INFO("error closing old connection to qmaster: " SFQ "\n", cl_get_error_text(ngc_error));
1478+
INFO("error closing old connection to qmaster: " SFQ, cl_get_error_text(ngc_error));
14791479
}
14801480
ngc_error = cl_commlib_open_connection(com_handle, (char*)mastername, (char*)prognames[QMASTER], 1);
14811481
if (ngc_error == CL_RETVAL_OK) {
14821482
DPRINTF("opened new connection to qmaster\n");
14831483
} else {
1484-
ERROR("error opening new connection to qmaster: " SFQ "\n", cl_get_error_text(ngc_error));
1484+
ERROR("error opening new connection to qmaster: " SFQ, cl_get_error_text(ngc_error));
14851485
}
14861486
}
14871487
#endif

‎source/libs/gdi/ocs_gdi_ClientServerBase.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,14 +249,14 @@ ocs::gdi::ClientServerBase::gdi_receive_message(char *fromcommproc, u_short *fro
249249
if (fromcommproc[0] != '\0' && fromhost[0] != '\0') {
250250
/* The connection was closed, reopen it */
251251
ret = cl_commlib_open_connection(handle, fromhost, fromcommproc, *fromid);
252-
INFO("reopen connection to %s,%s," sge_u32 " (1)\n", fromhost, fromcommproc, static_cast<u_long32>(*fromid));
252+
INFO("reopen connection to %s,%s," sge_u32 " (1)", fromhost, fromcommproc, static_cast<u_long32>(*fromid));
253253
if (ret == CL_RETVAL_OK) {
254-
INFO("reconnected successfully\n");
254+
INFO("reconnected successfully");
255255
ret = cl_commlib_receive_message(handle, fromhost, fromcommproc, *fromid, (bool) synchron, 0, &message,
256256
&sender);
257257
}
258258
} else {
259-
DEBUG("can't reopen a connection to unspecified host or commproc (1)\n");
259+
DEBUG("can't reopen a connection to unspecified host or commproc (1)");
260260
}
261261
}
262262

@@ -398,9 +398,9 @@ ocs::gdi::ClientServerBase::sge_gdi_get_any_request(char *rhost, char *commproc,
398398
if (commproc[0] != '\0' && rhost[0] != '\0') {
399399
/* The connection was closed, reopen it */
400400
i = cl_commlib_open_connection(handle, (char *) rhost, (char *) commproc, usid);
401-
INFO("reopen connection to %s,%s,%d (2)\n", rhost, commproc, (int)usid);
401+
INFO("reopen connection to %s,%s,%d (2)", rhost, commproc, (int)usid);
402402
if (i == CL_RETVAL_OK) {
403-
INFO("reconnected successfully\n");
403+
INFO("reconnected successfully");
404404
i = cl_commlib_receive_message(handle, rhost, commproc, usid,
405405
(bool) synchron, for_request_mid,
406406
&message, &sender);

‎source/libs/sgeobj/sge_job.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ lListElem *job_get_ja_task_template_pending(const lListElem *job,
121121
template_task = lFirstRW(lGetList(job, JB_ja_template));
122122

123123
if (!template_task) {
124-
ERROR("unable to retrieve template task\n");
124+
ERROR("unable to retrieve template task");
125125
} else {
126126
lSetUlong(template_task, JAT_state, JQUEUED | JWAITING);
127127
lSetUlong(template_task, JAT_task_number, ja_task_id);

‎test/libs/spool/test_spool.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ int main(int argc, char *argv[])
613613

614614
/* parse commandline parameters */
615615
if(argc != 4) {
616-
ERROR("usage: test_sge_spooling <method> <shared lib> <arguments>\n");
616+
ERROR("usage: test_sge_spooling <method> <shared lib> <arguments>");
617617
sge_exit(1);
618618
}
619619

@@ -672,7 +672,6 @@ int main(int argc, char *argv[])
672672
now = time(nullptr);
673673
if (now > next_prof_output) {
674674
prof_output_info(SGE_PROF_ALL, false, "test_sge_info:\n");
675-
/* INFO("\n%s", prof_get_info_string(SGE_PROF_ALL, false, nullptr)); */
676675
next_prof_output = now + 60;
677676
}
678677
}

‎test/libs/spool/test_spool_mt.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,10 @@ int main(int argc, char *argv[])
208208

209209
/* parse commandline parameters */
210210
if (argc < 3) {
211-
ERROR("usage: test_berkeleydb_mt <url> <threads> [<delay>]\n");
212-
ERROR(" <url> = path or host:database\n");
213-
ERROR(" <threads> = number of threads\n");
214-
ERROR(" <delay> = delay after writing [ms]\n");
211+
ERROR("usage: test_berkeleydb_mt <url> <threads> [<delay>]");
212+
ERROR(" <url> = path or host:database");
213+
ERROR(" <threads> = number of threads");
214+
ERROR(" <delay> = delay after writing [ms]");
215215
sge_exit(1);
216216
}
217217

0 commit comments

Comments
 (0)