*** empty log message ***

svn path=/trunk/boinc/; revision=1438
This commit is contained in:
Karl Chen 2003-06-14 20:04:45 +00:00
parent 4decb0f33f
commit f0ae670976
3 changed files with 16 additions and 16 deletions

View File

@ -72,7 +72,6 @@ win/win_config.h: $(top_srcdir)/config.h
EXTRA_DIST = \ EXTRA_DIST = \
*.h \ *.h \
mac/*.h mac/*.cpp \ mac/*.h mac/*.cpp \
win/*.h.in \
win/*.h win/*.cpp win/*.rc \ win/*.h win/*.cpp win/*.rc \
win/*.ico win/*.def win/res/*.* \ win/*.ico win/*.def win/res/*.* \
translation/language.* translation/language.*

View File

@ -137,12 +137,12 @@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
MYSQL_INCLUDES = /usr/local/mysql/include MYSQL_INCLUDES = /usr/local/mysql_32bit/include
MYSQL_INCLUDES2 = /usr/local/mysql/include/mysql MYSQL_INCLUDES2 = /usr/local/mysql_32bit/include/mysql
MYSQL_INCLUDES3 = /usr/include/mysql MYSQL_INCLUDES3 = /usr/include/mysql_32bit
MYSQL_LIBS = \ MYSQL_LIBS = \
-L/usr/local/mysql/lib -L/sw/lib/mysql -L/usr/local/lib/mysql \ -L/usr/local/mysql_32bit/lib -L/sw/lib/mysql -L/usr/local/lib/mysql \
-lmysqlclient -L/usr/local/lib -lz \ -lmysqlclient -L/usr/local/lib -lz \
-lm $(NETLIBS) -lm $(NETLIBS)
@ -224,7 +224,6 @@ speed_stats_CFLAGS = -O6 $(AM_CFLAGS)
EXTRA_DIST = \ EXTRA_DIST = \
*.h \ *.h \
mac/*.h mac/*.cpp \ mac/*.h mac/*.cpp \
win/*.h.in \
win/*.h win/*.cpp win/*.rc \ win/*.h win/*.cpp win/*.rc \
win/*.ico win/*.def win/res/*.* \ win/*.ico win/*.def win/res/*.* \
translation/language.* translation/language.*

View File

@ -2,18 +2,18 @@
// Version 1.0 (the "License"); you may not use this file except in // 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 // compliance with the License. You may obtain a copy of the License at
// http://boinc.berkeley.edu/license_1.0.txt // http://boinc.berkeley.edu/license_1.0.txt
// //
// Software distributed under the License is distributed on an "AS IS" // Software distributed under the License is distributed on an "AS IS"
// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
// License for the specific language governing rights and limitations // License for the specific language governing rights and limitations
// under the License. // under the License.
// //
// The Original Code is the Berkeley Open Infrastructure for Network Computing. // The Original Code is the Berkeley Open Infrastructure for Network Computing.
// //
// The Initial Developer of the Original Code is the SETI@home project. // The Initial Developer of the Original Code is the SETI@home project.
// Portions created by the SETI@home project are Copyright (C) 2002 // 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): // Contributor(s):
// //
@ -55,18 +55,20 @@ int check_set(vector<RESULT>& results, int& canonicalid, double& credit) {
// read the result files into malloc'd memory buffers // read the result files into malloc'd memory buffers
// //
for (i=0; i<n; i++) { for (i=0; i<n; i++) {
retval = get_output_file_path(results[i], path); RESULT& result = results[i];
retval = get_output_file_path(result, path);
if (retval) { if (retval) {
log_messages.printf( log_messages.printf(
SchedMessages::CRITICAL, SchedMessages::CRITICAL,
"check_set: can't get output filename for %s\n", "check_set: can't get output filename for %s\n",
results[i].name result.name
); );
return retval; return retval;
} }
retval = read_file_malloc(path, files[i]); retval = read_file_malloc(path, files[i]);
if (retval) { if (retval) {
log_messages.printf(SchedMessages::CRITICAL, "read_file_malloc %s %d\n", path, retval); log_messages.printf(SchedMessages::CRITICAL, "[RESULT#%d %s] Couldn't open %s (read_file_malloc()=%d)\n",
result.id, result.name, path, retval);
return retval; return retval;
} }
} }