From: Tobias Brunner Date: Tue, 8 Aug 2017 13:29:41 +0000 (+0200) Subject: sw-collector: Use correct variable to report failure to open history file X-Git-Tag: 5.6.0rc2~7 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d093488b96ea89e9702eec8b42577897715fb2c8;p=thirdparty%2Fstrongswan.git sw-collector: Use correct variable to report failure to open history file --- diff --git a/src/sw-collector/sw-collector.c b/src/sw-collector/sw-collector.c index e08f948687..19ccdd1d02 100644 --- a/src/sw-collector/sw-collector.c +++ b/src/sw-collector/sw-collector.c @@ -242,8 +242,8 @@ static int extract_history(sw_collector_info_t *info, sw_collector_db_t *db) } /* open history file for reading */ - history_path= lib->settings->get_str(lib->settings, "%s.history", NULL, - lib->ns); + history_path = lib->settings->get_str(lib->settings, "%s.history", NULL, + lib->ns); if (!history_path) { fprintf(stderr, "sw-collector.history path not set.\n"); @@ -252,7 +252,8 @@ static int extract_history(sw_collector_info_t *info, sw_collector_db_t *db) h = chunk_map(history_path, FALSE); if (!h) { - fprintf(stderr, "opening '%s' failed: %s", history, strerror(errno)); + fprintf(stderr, "opening '%s' failed: %s", history_path, + strerror(errno)); return EXIT_FAILURE; } history_chunk = *h; @@ -585,7 +586,7 @@ static int migrate(sw_collector_info_t *info, sw_collector_db_t *db) dpkg->destroy(dpkg); DBG1(DBG_IMC, "migrated %d sw identifier records", count); - + return status; }