diff --git a/checkin_notes b/checkin_notes index 7e2457586a..a06084beed 100755 --- a/checkin_notes +++ b/checkin_notes @@ -5515,3 +5515,7 @@ David Aug 1 2003 Karl 2003/08/01 - increased MAX_APP_VERSIONS from 100 to 500 sched/* + +Karl 2003/08/01 + - fixed \n s in client messages + client/* diff --git a/client/app.C b/client/app.C index 309df8ff17..29af8169f0 100644 --- a/client/app.C +++ b/client/app.C @@ -505,7 +505,7 @@ bool ACTIVE_TASK_SET::check_app_exited() { atp->state = PROCESS_ABORTED; atp->result->active_task_state = PROCESS_ABORTED; gstate.report_result_error( - *(atp->result), 0, "process was aborted\n" + *(atp->result), 0, "process was aborted" ); } else { atp->state = PROCESS_EXITED; @@ -516,7 +516,7 @@ bool ACTIVE_TASK_SET::check_app_exited() { if (exit_code) { gstate.report_result_error( *(atp->result), 0, - "process exited with a non zero exit code\n" + "process exited with a non zero exit code" ); } } @@ -557,7 +557,7 @@ bool ACTIVE_TASK_SET::check_app_exited() { atp->state = PROCESS_ABORTED; atp->result->active_task_state = PROCESS_ABORTED; gstate.report_result_error( - *(atp->result), 0, "process was aborted\n" + *(atp->result), 0, "process was aborted" ); } else { if (WIFEXITED(stat)) { @@ -572,7 +572,7 @@ bool ACTIVE_TASK_SET::check_app_exited() { if(atp->exit_status) { gstate.report_result_error( *(atp->result), 0, - "process exited with a nonzero exit code\n" + "process exited with a nonzero exit code" ); } scope_messages.printf("ACTIVE_TASK_SET::check_app_exited(): process exited: status %d\n", atp->exit_status); @@ -582,7 +582,7 @@ bool ACTIVE_TASK_SET::check_app_exited() { atp->result->signal = atp->signal; atp->result->active_task_state = PROCESS_WAS_SIGNALED; gstate.report_result_error( - *(atp->result), 0, "process was signaled\n" + *(atp->result), 0, "process was signaled" ); scope_messages.printf("ACTIVE_TASK_SET::check_app_exited(): process was signaled: %d\n", atp->signal); } else { @@ -914,7 +914,7 @@ int ACTIVE_TASK_SET::restart_tasks() { atp->result->active_task_state = PROCESS_COULDNT_START; gstate.report_result_error( *(atp->result), retval, - "Couldn't restart the app for this result.\n" + "Couldn't restart the app for this result." ); active_tasks.erase(iter); } else { diff --git a/client/client_state.C b/client/client_state.C index 66faff070b..bb6769da67 100644 --- a/client/client_state.C +++ b/client/client_state.C @@ -1581,7 +1581,7 @@ int CLIENT_STATE::report_result_error( sprintf( buf, - "%s\n" + "%s\n\n" "%d\n" "%d\n" "%d\n", diff --git a/client/cs_apps.C b/client/cs_apps.C index 9df45e0c29..40527973aa 100644 --- a/client/cs_apps.C +++ b/client/cs_apps.C @@ -2,18 +2,18 @@ // Version 1.0 (the "License"); you may not use this file except in // compliance with the License. You may obtain a copy of the License at // http://boinc.berkeley.edu/license_1.0.txt -// +// // Software distributed under the License is distributed on an "AS IS" // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the // License for the specific language governing rights and limitations -// under the License. -// -// The Original Code is the Berkeley Open Infrastructure for Network Computing. -// +// under the License. +// +// The Original Code is the Berkeley Open Infrastructure for Network Computing. +// // The Initial Developer of the Original Code is the SETI@home project. // Portions created by the SETI@home project are Copyright (C) 2002 -// University of California at Berkeley. All Rights Reserved. -// +// University of California at Berkeley. All Rights Reserved. +// // Contributor(s): // // High-level logic involving task execution @@ -249,7 +249,7 @@ bool CLIENT_STATE::start_apps() { atp->result->active_task_state = PROCESS_COULDNT_START; report_result_error( *(atp->result), retval, - "Couldn't start the app for this result.\n" + "Couldn't start the app for this result." ); } action = true;