diff options
author | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2013-04-07 13:08:30 +0000 |
---|---|---|
committer | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2013-04-07 13:08:30 +0000 |
commit | 363fd7e827e3b630f916f9d2bdda262180274789 (patch) | |
tree | 917a00cb091798c90273bf5d45bb86e4160de46a /flashrom.c | |
parent | 73dc0db7258121f260eeda04f50531f3eda943ee (diff) | |
download | flashrom-363fd7e827e3b630f916f9d2bdda262180274789.tar.gz flashrom-363fd7e827e3b630f916f9d2bdda262180274789.tar.bz2 flashrom-363fd7e827e3b630f916f9d2bdda262180274789.zip |
Get rid of perror()
It prints to stderr and that's not what we want necesserily;
using msg_*err gives us more control.
Corresponding to flashrom svn r1668.
Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Diffstat (limited to 'flashrom.c')
-rw-r--r-- | flashrom.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -29,6 +29,7 @@ #endif #include <string.h> #include <stdlib.h> +#include <errno.h> #include <ctype.h> #include <getopt.h> #if HAVE_UTSNAME == 1 @@ -1158,11 +1159,11 @@ int read_buf_from_file(unsigned char *buf, unsigned long size, struct stat image_stat; if ((image = fopen(filename, "rb")) == NULL) { - perror(filename); + msg_gerr("Error: opening file \"%s\" failed: %s\n", filename, strerror(errno)); return 1; } if (fstat(fileno(image), &image_stat) != 0) { - perror(filename); + msg_gerr("Error: getting metadata of file \"%s\" failed: %s\n", filename, strerror(errno)); fclose(image); return 1; } @@ -1174,7 +1175,7 @@ int read_buf_from_file(unsigned char *buf, unsigned long size, } numbytes = fread(buf, 1, size, image); if (fclose(image)) { - perror(filename); + msg_gerr("Error: closing file \"%s\" failed: %s\n", filename, strerror(errno)); return 1; } if (numbytes != size) { @@ -1196,7 +1197,7 @@ int write_buf_to_file(unsigned char *buf, unsigned long size, return 1; } if ((image = fopen(filename, "wb")) == NULL) { - perror(filename); + msg_gerr("Error: opening file \"%s\" failed: %s\n", filename, strerror(errno)); return 1; } |