HuntnGather – Diff between revs 38 and 39

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 38 Rev 39
Line 730... Line 730...
730 #if defined ___AsyncIO___ 730 #if defined ___AsyncIO___
731 if((tp[i] = OpenAsync(tmpNames->array[i], MODE_READ, ASYNC_BUF)) == NULL) { 731 if((tp[i] = OpenAsync(tmpNames->array[i], MODE_READ, ASYNC_BUF)) == NULL) {
732 #else 732 #else
733 if((tp[i] = fopen(tmpNames->array[i], "r")) == NULL) { 733 if((tp[i] = fopen(tmpNames->array[i], "r")) == NULL) {
734 #endif 734 #endif
735 fprintf(stderr, "Could not open file '%s' for reading.\n", tmpNames->array[i]); 735 fprintf(stderr, "Could not open file '%s' for reading.\n", (char *)tmpNames->array[i]);
736 // Close all temporary files. 736 // Close all temporary files.
737 while(--i > -1) { 737 while(--i > -1) {
738 #if defined ___AsyncIO___ 738 #if defined ___AsyncIO___
739 CloseAsync(tp[i]); 739 CloseAsync(tp[i]);
740 #else 740 #else
Line 859... Line 859...
859 fclose(fp); 859 fclose(fp);
860 #endif 860 #endif
861 return; 861 return;
862 } 862 }
Line 863... Line 863...
863   863  
864 // Rememb er the last minimal line. 864 // Remember the last minimal line.
Line 865... Line 865...
865 sprintf(rem, "%s", min); 865 sprintf(rem, "%s", min);
866   866  
867 free(min); 867 free(min);
Line 1074... Line 1074...
1074   1074  
1075 // Merge all the temporary files to the database file. 1075 // Merge all the temporary files to the database file.
Line 1076... Line 1076...
1076 MergeTemporaryFiles(dbFile, tmpNames, stats->lines); 1076 MergeTemporaryFiles(dbFile, tmpNames, stats->lines);
1077   1077  
Line 1078... Line 1078...
1078 // Remove all temporary files. 1078 // Remove all temporary files.
1079 RemoveFiles(tmpNames, tmpFiles); 1079 RemoveFiles(tmpNames);
1080   1080