diff --git a/src/import-export/log-replay/gnc-log-replay.c b/src/import-export/log-replay/gnc-log-replay.c index 159d355485..bebb6b12b6 100644 --- a/src/import-export/log-replay/gnc-log-replay.c +++ b/src/import-export/log-replay/gnc-log-replay.c @@ -491,7 +491,7 @@ static void process_trans_record( FILE *log_file) void gnc_file_log_replay (void) { - const char *selected_filename; + char *selected_filename; char *default_dir; char read_buf[256]; char *read_retval; @@ -553,6 +553,7 @@ void gnc_file_log_replay (void) } fclose(log_file); } + g_free(selected_filename); } } diff --git a/src/import-export/mt940/gnc-mt940-import.c b/src/import-export/mt940/gnc-mt940-import.c index 7b7cdc8512..f0856f4560 100644 --- a/src/import-export/mt940/gnc-mt940-import.c +++ b/src/import-export/mt940/gnc-mt940-import.c @@ -70,7 +70,7 @@ SCM scm_gnc_file_mt940_import () void gnc_file_mt940_import (void) { - const char *selected_filename; + char *selected_filename; char *default_dir; FILE *mt940_file; GNCImportMainMatcher *gnc_mt940_importer_gui = NULL; @@ -140,6 +140,7 @@ void gnc_file_mt940_import (void) HBCI_transactionReport_delete(tr); } g_free(mt940_records); + g_free(selected_filename); } } diff --git a/src/import-export/ofx/gnc-ofx-import.c b/src/import-export/ofx/gnc-ofx-import.c index f061441e80..8739cb6af4 100644 --- a/src/import-export/ofx/gnc-ofx-import.c +++ b/src/import-export/ofx/gnc-ofx-import.c @@ -81,7 +81,7 @@ void gnc_file_ofx_import (void) extern int ofx_INFO_msg; extern int ofx_STATUS_msg; char *filenames[3]; - const char *selected_filename; + char *selected_filename; char *default_dir; ofx_PARSER_msg = false; @@ -120,6 +120,7 @@ void gnc_file_ofx_import (void) DEBUG("Opening selected file"); ofx_proc_file(2, filenames); + g_free(selected_filename); } } diff --git a/src/import-export/qif-import/druid-qif-import.c b/src/import-export/qif-import/druid-qif-import.c index 6250fda8df..f83aaeafaf 100644 --- a/src/import-export/qif-import/druid-qif-import.c +++ b/src/import-export/qif-import/druid-qif-import.c @@ -350,7 +350,7 @@ gnc_ui_qif_import_select_file_cb(GtkButton * button, gpointer user_data) { QIFImportWindow * wind = user_data; - const char * new_file_name; + char * new_file_name; char *file_name, *default_dir; /* Default to whatever's already present */ @@ -360,12 +360,14 @@ gnc_ui_qif_import_select_file_cb(GtkButton * button, new_file_name = gnc_file_dialog (_("Select QIF File"), "*.qif", default_dir); /* Insure valid data, and something that can be freed. */ - if (new_file_name == NULL) + if (new_file_name == NULL) { file_name = g_strdup(default_dir); - else if (*new_file_name != '/') + } else if (*new_file_name != '/') { file_name = g_strdup_printf("%s%s", default_dir, new_file_name); - else - file_name = g_strdup(new_file_name); + g_free(new_file_name); + } else { + file_name = new_file_name; + } /* set the filename entry for what was selected */ gtk_entry_set_text(GTK_ENTRY(wind->filename_entry), file_name); diff --git a/src/report/report-gnome/window-report.c b/src/report/report-gnome/window-report.c index 7116b4bcfe..c4a533bb6c 100644 --- a/src/report/report-gnome/window-report.c +++ b/src/report/report-gnome/window-report.c @@ -396,10 +396,10 @@ gnc_get_export_type_choice (SCM export_types) return scm_list_ref (export_types, scm_int2num (choice)); } -static const char * +static char * gnc_get_export_filename (SCM choice) { - const char * filepath; + char * filepath; struct stat statbuf; char * title; char * type; @@ -434,6 +434,7 @@ gnc_get_export_filename (SCM choice) const char *format = _("You cannot save to that filename.\n\n%s"); gnc_error_dialog (NULL, format, strerror(errno)); + g_free(filepath); return NULL; } @@ -443,6 +444,7 @@ gnc_get_export_filename (SCM choice) const char *message = _("You cannot save to that file."); gnc_error_dialog (NULL, message); + g_free(filepath); return NULL; } @@ -451,8 +453,10 @@ gnc_get_export_filename (SCM choice) const char *format = _("The file \n %s\n already exists.\n" "Are you sure you want to overwrite it?"); - if (!gnc_verify_dialog (NULL, FALSE, format, filepath)) + if (!gnc_verify_dialog (NULL, FALSE, format, filepath)) { + g_free(filepath); return NULL; + } } return filepath; @@ -462,7 +466,7 @@ static int gnc_report_window_export_button_cb(GtkWidget * w, gpointer data) { gnc_report_window * report = data; - const char * filepath; + char * filepath; SCM export_types; SCM export_thunk; gboolean result; @@ -509,6 +513,7 @@ gnc_report_window_export_button_cb(GtkWidget * w, gpointer data) strerror (errno) ? strerror (errno) : ""); } + g_free(filepath); return TRUE; }