From c6fa32d2b5c08d2fcc92fee2974a3fc02a3ca1f7 Mon Sep 17 00:00:00 2001 From: Stefan Tauner Date: Fri, 4 Jan 2013 22:54:07 +0000 Subject: Introduce msg_*warn Also, unify all outputs of "Warning:" and "Error:" to use normal capitalization instead of mixing it with all capitals. Corresponding to flashrom svn r1643. Signed-off-by: Stefan Tauner Acked-by: Idwer Vollering --- dmi.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'dmi.c') diff --git a/dmi.c b/dmi.c index a6e21461..242889f6 100644 --- a/dmi.c +++ b/dmi.c @@ -105,7 +105,7 @@ static char *get_dmi_string(const char *string_name) "%s -s %s", dmidecode_command, string_name); dmidecode_pipe = popen(commandline, "r"); if (!dmidecode_pipe) { - msg_perr("DMI pipe open error\n"); + msg_perr("Opening DMI pipe failed!\n"); return NULL; } @@ -127,13 +127,11 @@ static char *get_dmi_string(const char *string_name) } } while (answerbuf[0] == '#'); - /* Toss all output above DMI_MAX_ANSWER_LEN away to prevent - deadlock on pclose. */ + /* Discard all output exceeding DMI_MAX_ANSWER_LEN to prevent deadlock on pclose. */ while (!feof(dmidecode_pipe)) getc(dmidecode_pipe); if (pclose(dmidecode_pipe) != 0) { - msg_pinfo("dmidecode execution unsuccessful - continuing " - "without DMI info\n"); + msg_pwarn("dmidecode execution unsuccessful - continuing without DMI info\n"); return NULL; } @@ -144,7 +142,7 @@ static char *get_dmi_string(const char *string_name) result = strdup(answerbuf); if (!result) - msg_perr("WARNING: Out of memory - DMI support fails"); + msg_pwarn("Warning: Out of memory - DMI support fails"); return result; } -- cgit v1.2.3