rixty
/
bygfoot
mirror of https://github.com/tstellar/bygfoot.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Validate country definitions on startup 

Try to load all the country definitions on startup to ensure that they
are all valid.  Invalid XML can cause bygfoot to abort when simulating
matches and make users lose any unsaved progress.
This commit is contained in:
Tom Stellard 2020-09-02 19:24:11 -07:00
parent 8bdeffc4d8
commit ef27c38c68
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main.c
View File

@ -54,6 +54,7 @@
#include "transfer_struct.h"
#include "variables.h"
#include "window.h"
#include "xml_country.h"
#include "xml_strategy.h"
#define DEBUG_LEVEL_DEFAULT 0
@ -318,6 +319,16 @@ main_init_variables(void)
option_add(&settings, "int_opt_disable_training_camp", 0, NULL);
}
/**
Callback to use with g_ptr_array_foreach() to validate country xml files.
*/
static void validate_country_file(gpointer country_file, gpointer user_data)
{
Country country;
memset(&country, 0, sizeof(country));
xml_country_read(country_file, &country);
}
/**
Process the command line arguments and do some things
that have to be done at the beginning (like initializing the
@ -334,6 +345,7 @@ main_init(gint *argc, gchar ***argv)
gchar buf[SMALL];
gchar *dir;
GPtrArray *country_files = NULL;
support_directories = NULL;
rand_generator = g_rand_new();
@ -368,6 +380,14 @@ main_init(gint *argc, gchar ***argv)
load_last_save = FALSE;
main_parse_cl_arguments(argc, argv);
/* Validate XML */
country_files = file_get_country_files();
if(country_files->len == 0)
main_exit_program(EXIT_NO_COUNTRY_FILES,
"Didn't find any country definition files in the support directories.");
g_ptr_array_foreach(country_files, validate_country_file, NULL);
}
/**