CHG: "hf mf hardnested" - less printing

CHG: some filehandles = NULL.

client/loclass/elite_crack.c

@@ -552,7 +552,6 @@ int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[])
  */
 int bruteforceFile(const char *filename, uint16_t keytable[])
 {
-
 	FILE *f = fopen(filename, "rb");
 	if(!f) {
 		prnlog("Failed to read from file '%s'", filename);
@@ -565,19 +564,23 @@ int bruteforceFile(const char *filename, uint16_t keytable[])
 
 	if (fsize < 0) {
 		prnlog("Error, when getting filesize");
-		fclose(f);
+		if (f) {
+			fclose(f);
+			f = NULL;
+		}
 		return 1;
 	}
 
 	uint8_t *dump = malloc(fsize);
 	size_t bytes_read = fread(dump, 1, fsize, f);
 
-	fclose(f);
-    if (bytes_read < fsize)
-    {
+	if (f) {
+		fclose(f);
+		f = NULL;
+	}
+    if (bytes_read < fsize) {
         prnlog("Error, could only read %d bytes (should be %d)",bytes_read, fsize );
     }
-
 	uint8_t res = bruteforceDump(dump,fsize,keytable);
 	free(dump);
 	return res;

client/loclass/fileutils.c

@@ -77,17 +77,19 @@ int saveFile(const char *preferredName, const char *suffix, const void* data, si
 	/* We should have a valid filename now, e.g. dumpdata-3.bin */
 
 	/*Opening file for writing in binary mode*/
-	FILE *fileHandle=fopen(fileName,"wb");
-	if(!fileHandle) {
+	FILE *f = fopen(fileName,"wb");
+	if (!f) {
 		prnlog("Failed to write to file '%s'", fileName);
 		free(fileName);
 		return 1;
 	}
-	fwrite(data, 1,	datalen, fileHandle);
-	fclose(fileHandle);
+	fwrite(data, 1,	datalen, f);
+	if (f) {
+		fclose(f);
+		f = NULL;
+	}
 	prnlog("Saved data to '%s'", fileName);
 	free(fileName);
-
 	return 0;
 }
 

client/loclass/ikeys.c

@@ -748,7 +748,10 @@ int readKeyFile(uint8_t key[8])
 	if ( bytes_read == 1) {
 		retval = 0;	
 	}
-	fclose(f);
+	if (f) {
+		fclose(f);
+		f = NULL;
+	}
 	return retval;
 }