HuntnGather – Diff between revs 38 and 39

Subversion Repositories:

?pathlinks?

Rev 38 – Rev 41 – Go to most recent revision – Details – Blame – Last modification – View Log

+	*
 	* Create multiple temporary files and return their names.
 	*/
 VECTOR *CreateTemporaryFiles(int files) {
 	VECTOR *tmpNames;
+	int total;
 	if((tmpNames = malloc(1 * sizeof(*tmpNames))) == NULL) {
 		fprintf(stderr, "Memory allocation failure.\n");
 		return NULL;
 	if(PROGRAM_VERBOSE) {
 		fprintf(stdout, "Creating temporary files...\r");
+	}
+	tmpNames->length = 0;
-	tmpNames->length = 0;
+	total = files;
 	while(PROGRAM_RUN && --files > -1) {
 #if defined ___AmigaOS___
 		// Check if CTRL+C was pressed and abort the program.
 		if(SetSignal(0L, SIGBREAKF_CTRL_C) & SIGBREAKF_CTRL_C) {
 			PROGRAM_RUN = FALSE;
 			continue;
+		}
 #endif
-		tmpNames[files] = CreateTemporaryFile();
+		tmpNames->array[files] = CreateTemporaryFile();
 		++tmpNames->length;
 		if(PROGRAM_VERBOSE) {
-			fprintf(stdout, "Creating temporary files: %d%%.\r", 100 - (int)(((float)count / files) * 100.0));
+			fprintf(stdout, "Creating temporary files: %d%%.\r", (int)(((float)tmpNames->length / total) * 100.0));
+		}
+	}
 int RemoveFile(char *name) {
 	return remove(name) == 0;
 #endif
+}
 /*
+	*
 	* Deletes files.
 	*/
-void RemoveFiles(char **names, int count) {
+void RemoveFiles(VECTOR *names) {
 	int i;
-	for(i = 0; i < count; ++i) {
+	for(i = 0; i < names->length; ++i) {
-		if(RemoveFile(names[i]) == FALSE) {
+		if(RemoveFile(names->array[i]) == FALSE) {
-			fprintf(stderr, "Could not remove file '%s'.\n", names[i]);
+			fprintf(stderr, "Could not remove file '%s'.\n", (char *)names->array[i]);
 			continue;
 		}
-		fprintf(stderr, "Removing file '%s'\n", names[i]);
+		fprintf(stderr, "Removing file '%s'\n", (char *)names->array[i]);
+	}
+}