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 --- main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 3b6e00449..3c0ea7381 100644 --- a/main.c +++ b/main.c @@ -348,8 +348,12 @@ int main(int argc, char **argv) /* if we have exactly one filename, parse_file will set * that to be the default. Otherwise there will be no default filename */ set_filename(NULL, TRUE); - parse_file(a, &error, no_filenames); - no_filenames = FALSE; + parse_file(a, &error); + if (no_filenames) + { + set_filename(a, TRUE); + no_filenames = FALSE; + } if (error != NULL) { report_error(error); @@ -360,7 +364,7 @@ int main(int argc, char **argv) if (no_filenames) { GError *error = NULL; 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 sure we remember this as the filename in use */ set_filename(filename, FALSE); -- cgit v1.2.3-70-g09d2