mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move set_filename() calls outside of parse_file()

Browse source 
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: Alberto Mardegan <mardy@users.sourceforge.net>
This commit is contained in:
Alberto Mardegan 2013-04-02 18:46:41 +03:00
parent 40e3671bd2
commit 2f759f52e1
4 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dive.h
View file

@ -555,7 +555,7 @@ extern void set_filename(const char *filename, gboolean force);
extern int parse_dm4_buffer(const char *url, const char *buf, int size, struct dive_table *table, GError **error); extern int parse_dm4_buffer(const char *url, const char *buf, int size, struct dive_table *table, GError **error);
extern void parse_file(const char *filename, GError **error, gboolean possible_default_filename); extern void parse_file(const char *filename, GError **error);
extern void show_dive_info(struct dive *); extern void show_dive_info(struct dive *);

12
file.c
View file

@ -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); 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; struct memblock mem;
#ifdef SQLITE3 #ifdef SQLITE3
@ -283,19 +283,9 @@ void parse_file(const char *filename, GError **error, gboolean possible_default_
filename); 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; return;
} }
if (possible_default_filename)
set_filename(filename, TRUE);
#ifdef SQLITE3 #ifdef SQLITE3
fmt = strrchr(filename, '.'); fmt = strrchr(filename, '.');
if (fmt && (!strcasecmp(fmt + 1, "DB") || !strcasecmp(fmt + 1, "BAK"))) { if (fmt && (!strcasecmp(fmt + 1, "DB") || !strcasecmp(fmt + 1, "BAK"))) {

10
main.c
View file

@ -348,8 +348,12 @@ int main(int argc, char **argv)
/* if we have exactly one filename, parse_file will set /* if we have exactly one filename, parse_file will set
* that to be the default. Otherwise there will be no default filename */ * that to be the default. Otherwise there will be no default filename */
set_filename(NULL, TRUE); set_filename(NULL, TRUE);
parse_file(a, &error, no_filenames); parse_file(a, &error);
no_filenames = FALSE; if (no_filenames)
{
set_filename(a, TRUE);
no_filenames = FALSE;
}
if (error != NULL) if (error != NULL)
{ {
report_error(error); report_error(error);
@ -360,7 +364,7 @@ int main(int argc, char **argv)
if (no_filenames) { if (no_filenames) {
GError *error = NULL; GError *error = NULL;
const char *filename = prefs.default_filename; const char *filename = prefs.default_filename;
parse_file(filename, &error, TRUE); parse_file(filename, &error);
/* don't report errors - this file may not exist, but make /* don't report errors - this file may not exist, but make
sure we remember this as the filename in use */ sure we remember this as the filename in use */
set_filename(filename, FALSE); set_filename(filename, FALSE);

5
qt-gui.cpp
View file

@ -348,7 +348,8 @@ static void file_open(GtkWidget *w, gpointer data)
GError *error = NULL; GError *error = NULL;
filename = (char *)fn_glist->data; filename = (char *)fn_glist->data;
parse_file(filename, &error, TRUE); parse_file(filename, &error);
set_filename(filename, TRUE);
if (error != NULL) if (error != NULL)
{ {
report_error(error); report_error(error);
@ -2236,7 +2237,7 @@ static GtkWidget *dive_profile_widget(void)
static void do_import_file(gpointer data, gpointer user_data) static void do_import_file(gpointer data, gpointer user_data)
{ {
GError *error = NULL; GError *error = NULL;
parse_file((const char *)data, &error, FALSE); parse_file((const char *)data, &error);
if (error != NULL) if (error != NULL)
{ {