IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Adjust GError usage to comply with the GError rules

Browse Source 
- Define an error domain (different from 0)
- Adjust member names in error enumeration to follow
  required naming conventions
This commit is contained in:
Geert Janssens 2015-05-12 21:58:24 +02:00
parent bd59bab28f
commit 25542415a6
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/import-export/csv-imp/assistant-csv-trans-import.c
View File

@ -187,7 +187,7 @@ csv_import_trans_file_chooser_confirm_cb (GtkWidget *button, CsvImportTrans *inf
{
/* If we couldn't load the file ... */
gnc_error_dialog (NULL, "%s", error->message);
if (error->code == GNC_CSV_FILE_OPEN_ERR)
if (error->code == GNC_CSV_IMP_ERROR_OPEN)
{
gnc_csv_parse_data_free (parse_data);
return;

17
src/import-export/csv-imp/gnc-csv-model.c
View File

@ -44,6 +44,12 @@
#include <stdlib.h>
#include <math.h>
GQuark
gnc_csv_imp_error_quark (void)
{
return g_quark_from_static_string ("g-csv-imp-error-quark");
}
G_GNUC_UNUSED static QofLogModule log_module = GNC_MOD_IMPORT;
const int num_date_formats = 5;
@ -466,14 +472,13 @@ int gnc_csv_load_file (GncCsvParseData* parse_data, const char* filename,
const char* guess_enc = NULL;
/* Get the raw data first and handle an error if one occurs. */
parse_data->raw_mapping = g_mapped_file_new (filename, FALSE, error);
parse_data->raw_mapping = g_mapped_file_new (filename, FALSE, NULL);
if (parse_data->raw_mapping == NULL)
{
/* TODO Handle file opening errors more specifically,
* e.g. inexistent file versus no read permission. */
parse_data->raw_str.begin = NULL;
g_clear_error (error);
g_set_error (error, 0, GNC_CSV_FILE_OPEN_ERR, "%s", _("File opening failed."));
g_set_error (error, GNC_CSV_IMP_ERROR, GNC_CSV_IMP_ERROR_OPEN, "%s", _("File opening failed."));
return 1;
}
@ -488,7 +493,7 @@ int gnc_csv_load_file (GncCsvParseData* parse_data, const char* filename,
"UTF-8", NULL);
if (guess_enc == NULL)
{
g_set_error (error, 0, GNC_CSV_ENCODING_ERR, "%s", _("Unknown encoding."));
g_set_error (error, GNC_CSV_IMP_ERROR, GNC_CSV_IMP_ERROR_ENCODING, "%s", _("Unknown encoding."));
return 1;
}
/* Convert using the guessed encoding into parse_data->file_str and
@ -496,7 +501,7 @@ int gnc_csv_load_file (GncCsvParseData* parse_data, const char* filename,
gnc_csv_convert_encoding (parse_data, guess_enc, error);
if (parse_data->file_str.begin == NULL)
{
g_set_error (error, 0, GNC_CSV_ENCODING_ERR, "%s", _("Unknown encoding."));
g_set_error (error, GNC_CSV_IMP_ERROR, GNC_CSV_IMP_ERROR_ENCODING, "%s", _("Unknown encoding."));
return 1;
}
else
@ -559,7 +564,7 @@ int gnc_csv_parse (GncCsvParseData* parse_data, gboolean guessColTypes, GError**
/* If it failed, generate an error. */
if (parse_data->orig_lines == NULL)
{
g_set_error (error, 0, 0, "Parsing failed.");
g_set_error (error, GNC_CSV_IMP_ERROR, GNC_CSV_IMP_ERROR_PARSE, "Parsing failed.");
return 1;
}

12
src/import-export/csv-imp/gnc-csv-model.h
View File

@ -51,12 +51,18 @@ enum GncCsvColumnType {
GNC_CSV_NUM_COL_TYPES
};
/** Error domain for the csv importer. */
#define GNC_CSV_IMP_ERROR gnc_csv_imp_error_quark ()
GQuark gnc_csv_imp_error_quark (void);
/** Enumeration for error types. These are the different types of
* errors that various functions used for the CSV/Fixed-Width importer
* can have. */
enum GncCsvErrorType {GNC_CSV_FILE_OPEN_ERR,
GNC_CSV_ENCODING_ERR
};
enum GncCsvErrorType {
GNC_CSV_IMP_ERROR_OPEN,
GNC_CSV_IMP_ERROR_ENCODING,
GNC_CSV_IMP_ERROR_PARSE
};
/** Struct for containing a string. This struct simply contains
* pointers to the beginning and end of a string. We need this because