diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2008-01-24 19:09:30 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2008-01-24 19:09:30 +0000 |
commit | 11a9f57c1a60168c6389b9d2cfc226694d9f715e (patch) | |
tree | 68be99065f8dbc6765c69edb1379cebadcada67d /file.c | |
parent | 51060a1b5c1d5f6397353a6a7b29a4730d9d59d5 (diff) |
Fixed some malloc -> g_malloc, free -> g_free, strdup -> g_strdup.
svn path=/trunk/; revision=24179
Diffstat (limited to 'file.c')
-rw-r--r-- | file.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1138,7 +1138,7 @@ cf_merge_files(char **out_filenamep, int in_file_count, /* open the input files */ if (!merge_open_in_files(in_file_count, in_filenames, &in_files, &open_err, &err_info, &err_fileno)) { - free(in_files); + g_free(in_files); cf_open_failure_alert_box(in_filenames[err_fileno], open_err, err_info, FALSE, 0); return CF_ERROR; @@ -1159,7 +1159,7 @@ cf_merge_files(char **out_filenamep, int in_file_count, if (out_fd == -1) { err_info = NULL; merge_close_in_files(in_file_count, in_files); - free(in_files); + g_free(in_files); cf_open_failure_alert_box(out_filename, open_err, NULL, TRUE, file_type); return CF_ERROR; } @@ -1171,7 +1171,7 @@ cf_merge_files(char **out_filenamep, int in_file_count, if (pdh == NULL) { eth_close(out_fd); merge_close_in_files(in_file_count, in_files); - free(in_files); + g_free(in_files); cf_open_failure_alert_box(out_filename, open_err, err_info, TRUE, file_type); return CF_ERROR; |