Remove programmer_shutdown() from doit()
Because the programmer initialization that has to be called way
earlier and independently elsewhere, it does not make a lot of sense
to deinit within doit(). Also, free the logfile name at the end of
main() to catch more execution paths and because this moves it to
the other cleanup instructions.
Corresponding to flashrom svn r1788.
Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
diff --git a/flashrom.c b/flashrom.c
index 23728f6..c20461a 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -413,6 +413,11 @@
return ret;
}
+/** Calls registered shutdown functions and resets internal programmer-related variables.
+ * Calling it is safe even without previous initialization, but further interactions with programmer support
+ * require a call to programmer_init() (afterwards).
+ *
+ * @return The OR-ed result values of all shutdown functions (i.e. 0 on success). */
int programmer_shutdown(void)
{
int ret = 0;
@@ -1913,14 +1918,12 @@
if (chip_safety_check(flash, force, read_it, write_it, erase_it, verify_it)) {
msg_cerr("Aborting.\n");
- ret = 1;
- goto out_nofree;
+ return 1;
}
if (normalize_romentries(flash)) {
msg_cerr("Requested regions can not be handled. Aborting.\n");
- ret = 1;
- goto out_nofree;
+ return 1;
}
/* Given the existence of read locks, we want to unlock for read,
@@ -1930,8 +1933,7 @@
flash->chip->unlock(flash);
if (read_it) {
- ret = read_flash_to_file(flash, filename);
- goto out_nofree;
+ return read_flash_to_file(flash, filename);
}
oldcontents = malloc(size);
@@ -2048,7 +2050,5 @@
out:
free(oldcontents);
free(newcontents);
-out_nofree:
- programmer_shutdown();
return ret;
}