summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/file-data.c11
-rw-r--r--src/fr-command-tar.c2
2 files changed, 8 insertions, 5 deletions
diff --git a/src/file-data.c b/src/file-data.c
index 944844d..0496258 100644
--- a/src/file-data.c
+++ b/src/file-data.c
@@ -98,10 +98,15 @@ file_data_get_type (void)
void
file_data_update_content_type (FileData *fdata)
{
- if (fdata->dir)
+ if (fdata->dir) {
fdata->content_type = MIME_TYPE_DIRECTORY;
- else
- fdata->content_type = get_static_string (g_content_type_guess (fdata->full_path, NULL, 0, NULL));
+ } else {
+ char *content_type;
+
+ content_type = g_content_type_guess (fdata->full_path, NULL, 0, NULL);
+ fdata->content_type = get_static_string (content_type);
+ g_free (content_type);
+ }
}
gboolean
diff --git a/src/fr-command-tar.c b/src/fr-command-tar.c
index 0452bb8..e73b214 100644
--- a/src/fr-command-tar.c
+++ b/src/fr-command-tar.c
@@ -138,8 +138,6 @@ process_line (char *line,
g_free (name);
name = g_filename_from_utf8 (fdata->original_path, -1, NULL, NULL, NULL);
if (name) {
- if (fdata->free_original_path)
- g_free (fdata->original_path);
fdata->original_path = g_strdup (name);
fdata->free_original_path = TRUE;
}