diff options
author | Vasily_Makarov <danilka.pro@gmail.com> | 2012-02-09 12:07:10 +0400 |
---|---|---|
committer | Vasily_Makarov <danilka.pro@gmail.com> | 2012-02-09 12:07:10 +0400 |
commit | cc459a0b40bb56f6559c855ecb5b956b9ee6a90b (patch) | |
tree | 8698d1e99eec34b24f14f21c176871b88863fa18 /saedit/config.c | |
parent | 6545f58904d754db19800a1cd21f472eb13339bd (diff) | |
download | evol-tools-cc459a0b40bb56f6559c855ecb5b956b9ee6a90b.tar.gz evol-tools-cc459a0b40bb56f6559c855ecb5b956b9ee6a90b.tar.bz2 evol-tools-cc459a0b40bb56f6559c855ecb5b956b9ee6a90b.tar.xz evol-tools-cc459a0b40bb56f6559c855ecb5b956b9ee6a90b.zip |
SAE: Changed error structure
Diffstat (limited to 'saedit/config.c')
-rw-r--r-- | saedit/config.c | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/saedit/config.c b/saedit/config.c index cdc0ffd..303db6d 100644 --- a/saedit/config.c +++ b/saedit/config.c @@ -12,71 +12,71 @@ #include "config.h" Options *config_options_new() { - return g_new0(Options, 1); + return g_new0(Options, 1); } void config_options_load_from_file(Options *options, gchar *file, gchar *data_folder) { - options->sprites = NULL; + options->sprites = NULL; - XMLNode *node = xml_parse_file(file); + XMLNode *node = xml_parse_file(file); - if (node != NULL) { - GList *list = node->sub_nodes; - while (TRUE) { - list = g_list_find_custom(list, "option", xml_node_compare_with_name_func); - if (list == NULL) - break; - gchar *name_attr = xml_node_get_attr_value(list->data, "name"); - if (name_attr != NULL) { - if (g_strcmp0(name_attr, "sprites") == 0) - options->sprites = xml_node_get_attr_value(list->data, "value"); - } - list = list->next; - } - } + if (node != NULL) { + GList *list = node->sub_nodes; + while (TRUE) { + list = g_list_find_custom(list, "option", xml_node_compare_with_name_func); + if (list == NULL) + break; + gchar *name_attr = xml_node_get_attr_value(list->data, "name"); + if (name_attr != NULL) { + if (g_strcmp0(name_attr, "sprites") == 0) + options->sprites = xml_node_get_attr_value(list->data, "value"); + } + list = list->next; + } + } - if (options->sprites == NULL) options->sprites = OPTION_SPRITES_DEFAULT; - options->sprites = g_strjoin(SEPARATOR_SLASH, data_folder, options->sprites, NULL); + if (options->sprites == NULL) options->sprites = OPTION_SPRITES_DEFAULT; + options->sprites = g_strjoin(SEPARATOR_SLASH, data_folder, options->sprites, NULL); } Keys *config_keys_new() { - Keys *keys = g_new0(Keys, 1); - keys->clientdata_folder = KEY_CLIENTDATA_FOLDER_DEFAULT; - keys->show_grid = KEY_SHOW_GRID_DEFAULT; - return keys; + Keys *keys = g_new0(Keys, 1); + keys->clientdata_folder = KEY_CLIENTDATA_FOLDER_DEFAULT; + keys->show_grid = KEY_SHOW_GRID_DEFAULT; + return keys; } void config_keys_save(Keys *keys) { - GKeyFile *key_file = g_key_file_new(); - g_key_file_set_value(key_file, "General", "ClientdataFolder", - g_strjoin(SEPARATOR_SLASH, - keys->clientdata_folder, - POSTFIX_FOLDER, - NULL)); - g_key_file_set_boolean(key_file, "General", "ShowGrid", keys->show_grid); + GKeyFile *key_file = g_key_file_new(); + g_key_file_set_value(key_file, "General", "ClientdataFolder", + g_strjoin(SEPARATOR_SLASH, + keys->clientdata_folder, + POSTFIX_FOLDER, + NULL)); + g_key_file_set_boolean(key_file, "General", "ShowGrid", keys->show_grid); - mkdir(KEYS_CONFIG_DIR, S_IRWXU); - int fd = g_creat(KEYS_CONFIG_FILE, S_IREAD | S_IWRITE); - gchar *buf = g_key_file_to_data(key_file, NULL, NULL); - write(fd, buf, strlen(buf)); - close(fd); + mkdir(KEYS_CONFIG_DIR, S_IRWXU); + int fd = g_creat(KEYS_CONFIG_FILE, S_IREAD | S_IWRITE); + gchar *buf = g_key_file_to_data(key_file, NULL, NULL); + write(fd, buf, strlen(buf)); + close(fd); - g_key_file_free(key_file); + g_key_file_free(key_file); } void config_keys_load(Keys *keys) { - GKeyFile *key_file = g_key_file_new(); + GKeyFile *key_file = g_key_file_new(); - g_key_file_load_from_file(key_file, - KEYS_CONFIG_FILE, - 0, - NULL); - if (g_key_file_has_key(key_file, "General", "ClientdataFolder", NULL)) - keys->clientdata_folder = g_key_file_get_value(key_file, "General", "ClientdataFolder", NULL); - if (g_key_file_has_key(key_file, "General", "ShowGrid", NULL)) - keys->show_grid = g_key_file_get_boolean(key_file, "General", "ShowGrid", NULL); + g_key_file_load_from_file(key_file, + KEYS_CONFIG_FILE, + 0, + NULL); + if (g_key_file_has_key(key_file, "General", "ClientdataFolder", NULL)) + keys->clientdata_folder = g_key_file_get_value(key_file, "General", "ClientdataFolder", NULL); + if (g_key_file_has_key(key_file, "General", "ShowGrid", NULL)) + keys->show_grid = g_key_file_get_boolean(key_file, "General", "ShowGrid", NULL); - g_key_file_free(key_file); + g_key_file_free(key_file); } |