From 68119c5b5415c2797e11356dc8db63bd84c577cf Mon Sep 17 00:00:00 2001 From: Alberto Mardegan Date: Tue, 2 Apr 2013 18:46:41 +0300 Subject: Move set_filename() calls outside of parse_file() Remove the boolean parameter from parse_file; the code is more readable by having an explicit call to set_filename() where necessary, rather than a boolean parameter. Signed-off-by: Henrik Brautaset Aronsen Signed-off-by: Alberto Mardegan --- file.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'file.c') diff --git a/file.c b/file.c index 8deb2fe97..401bd5c36 100644 --- a/file.c +++ b/file.c @@ -263,7 +263,7 @@ static void parse_file_buffer(const char *filename, struct memblock *mem, GError parse_xml_buffer(filename, mem->buffer, mem->size, &dive_table, error); } -void parse_file(const char *filename, GError **error, gboolean possible_default_filename) +void parse_file(const char *filename, GError **error) { struct memblock mem; #ifdef SQLITE3 @@ -283,19 +283,9 @@ void parse_file(const char *filename, GError **error, gboolean possible_default_ filename); } - /* - * We do *not* want to leave the old default_filename - * just because the open failed. - */ - if (possible_default_filename) - set_filename(filename, TRUE); - return; } - if (possible_default_filename) - set_filename(filename, TRUE); - #ifdef SQLITE3 fmt = strrchr(filename, '.'); if (fmt && (!strcasecmp(fmt + 1, "DB") || !strcasecmp(fmt + 1, "BAK"))) { -- cgit v1.2.3-70-g09d2