[PATCH 2/4] lib: fwts_acpi_tables: set count correctly on error

Colin King colin.king at canonical.com
Thu Apr 23 11:57:36 UTC 2015


From: Colin Ian King <colin.king at canonical.com>

On a scandir failure count is -1 and should be in set to zero.
Also, remove the error message since the failure to get ACPI tables
is reported by all the callers to fwts_acpi_load_tables_from_file_generic
so the error message is unnecessary.

Signed-off-by: Colin Ian King <colin.king at canonical.com>
---
 src/lib/src/fwts_acpi_tables.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c
index 08230f8..24a724e 100644
--- a/src/lib/src/fwts_acpi_tables.c
+++ b/src/lib/src/fwts_acpi_tables.c
@@ -696,8 +696,7 @@ static int fwts_acpi_load_tables_from_file_generic(
 	 * in some form of deterministic order
 	 */
 	if ((*count = scandir(acpi_table_path, &dir_entries, 0, alphasort)) < 0) {
-		fwts_log_error(fw, "Cannot open directory '%s' to read ACPI tables.",
-			acpi_table_path);
+		*count = 0;
 		return FWTS_ERROR;
 	}
 
-- 
2.1.4




More information about the fwts-devel mailing list