diff --git a/dcapi/boinc/wu.C b/dcapi/boinc/wu.C index 2780455835..851c1200ea 100644 --- a/dcapi/boinc/wu.C +++ b/dcapi/boinc/wu.C @@ -684,6 +684,8 @@ int DC_addWUInput(DC_Workunit *wu, const char *logicalFileName, const char *URL, ret = _DC_copyFile(URL, file->path); if (ret) { + DC_log(LOG_ERR, "Failed to copy the input file %s to %s", + URL, file->path); _DC_destroyPhysicalFile(file); return ret; } diff --git a/dcapi/condor/condor_master.c b/dcapi/condor/condor_master.c index ea2747a72e..1dbfdd35dd 100644 --- a/dcapi/condor/condor_master.c +++ b/dcapi/condor/condor_master.c @@ -481,8 +481,8 @@ DC_addWUInput(DC_Workunit *wu, ret= _DC_copyFile(URL, file->path); if (ret) { - DC_log(LOG_ERR, "Failed to link %s to %s: %s", - URL, file->path, strerror(errno)); + DC_log(LOG_ERR, "Failed to copy %s to %s", + URL, file->path); _DC_destroyPhysicalFile(file); return(DC_ERR_BADPARAM); /* XXX */ } diff --git a/dcapi/condor/condor_slave.c b/dcapi/condor/condor_slave.c index fa00b75c63..a1f81066aa 100644 --- a/dcapi/condor/condor_slave.c +++ b/dcapi/condor/condor_slave.c @@ -190,7 +190,7 @@ int DC_sendResult(const char *logicalFileName, if ((ret= _DC_copyFile(path, fn)) != DC_OK) { DC_log(LOG_ERR, "Failed to copy subresult file %s to " - "%s: %s", path, fn, strerror(errno)); + "%s", path, fn); free(fn); return(ret); } diff --git a/dcapi/condor/condor_utils.c b/dcapi/condor/condor_utils.c index 0d286a3e6c..63fe59de3b 100644 --- a/dcapi/condor/condor_utils.c +++ b/dcapi/condor/condor_utils.c @@ -220,12 +220,11 @@ _DC_create_message(char *box, if (message) fprintf(f, "%s", message); else if (msgfile) - { - if ((ret= _DC_copyFile(msgfile, fn)) != 0) - DC_log(LOG_ERR, "copyFile(%s,%s) " - "error: %s", msgfile, fn, - strerror(errno)); - } + { + if (_DC_copyFile(msgfile, fn)) + DC_log(LOG_ERR, "copyFile(%s,%s) error", + msgfile, fn); + } else { DC_log(LOG_WARNING, "No message specified for " diff --git a/dcapi/local/local_client.c b/dcapi/local/local_client.c index 9df4ef5f19..479ab49172 100644 --- a/dcapi/local/local_client.c +++ b/dcapi/local/local_client.c @@ -196,7 +196,7 @@ int DC_sendResult(const char *logicalFileName, const char *path, DC_FileMode fil if ((ret= _DC_copyFile(path, fn)) != DC_OK) { DC_log(LOG_ERR, "Failed to copy subresult file %s to " - "%s: %s", path, fn, strerror(errno)); + "%s", path, fn); free(fn); return(ret); } diff --git a/dcapi/local/local_utils.c b/dcapi/local/local_utils.c index d91541e31f..457c5452a4 100644 --- a/dcapi/local/local_utils.c +++ b/dcapi/local/local_utils.c @@ -224,12 +224,11 @@ _DC_create_message(char *box, if (message) fprintf(f, "%s", message); else if (msgfile) - { - if ((ret= _DC_copyFile(msgfile, fn)) != 0) - DC_log(LOG_ERR, "copyFile(%s,%s) " - "error: %s", msgfile, fn, - strerror(errno)); - } + { + if (_DC_copyFile(msgfile, fn)) + DC_log(LOG_ERR, "copyFile(%s,%s) error", + msgfile, fn); + } else { DC_log(LOG_WARNING, "No message specified for "