diff options
| author |  Alberto Mardegan <mardy@users.sourceforge.net> | 2013-04-02 18:46:41 +0300 |
|---|---|---|
| committer |  Henrik Brautaset Aronsen <subsurface@henrik.synth.no> | 2013-04-07 17:37:09 +0200 |
| commit | 68119c5b5415c2797e11356dc8db63bd84c577cf (patch) | |
| tree | 69984129fe914f3cae60523227fc20f1c62eb173 /file.c | |
| parent | 0b8462bd584c7606e3a9091947ccdbf04a32dea8 (diff) | |
| download | subsurface-68119c5b5415c2797e11356dc8db63bd84c577cf.tar.gz | |
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 <subsurface@henrik.synth.no>
Signed-off-by: Alberto Mardegan <mardy@users.sourceforge.net>
Diffstat (limited to 'file.c')
| -rw-r--r-- | file.c | 12 |
1 files changed, 1 insertions, 11 deletions
@@ -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"))) { |