From f438d9aaa6d2a7bd67017f5e28df31dfd844458d Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 29 May 2012 22:09:31 -0400 Subject: [PATCH] core: Drop some dead temporary file code --- src/libostree/ostree-core.c | 59 ------------------------------------- src/libostree/ostree-core.h | 8 ----- 2 files changed, 67 deletions(-) diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c index 20abeb68..61718d5b 100644 --- a/src/libostree/ostree-core.c +++ b/src/libostree/ostree-core.c @@ -1303,65 +1303,6 @@ ostree_create_temp_regular_file (GFile *dir, return ret; } -gboolean -ostree_create_temp_hardlink (GFile *dir, - GFile *src, - const char *prefix, - const char *suffix, - GFile **out_file, - GCancellable *cancellable, - GError **error) -{ - gboolean ret = FALSE; - int i = 0; - ot_lfree char *possible_name = NULL; - ot_lobj GFile *possible_file = NULL; - GString *tmp_name = NULL; - - tmp_name = create_tmp_string (ot_gfile_get_path_cached (dir), - prefix, suffix); - - /* 128 attempts seems reasonable... */ - for (i = 0; i < 128; i++) - { - if (g_cancellable_set_error_if_cancelled (cancellable, error)) - goto out; - - g_free (possible_name); - possible_name = subst_xxxxxx (tmp_name->str); - g_clear_object (&possible_file); - possible_file = g_file_get_child (dir, possible_name); - - if (link (ot_gfile_get_path_cached (src), ot_gfile_get_path_cached (possible_file)) < 0) - { - if (errno == EEXIST) - continue; - else - { - ot_util_set_error_from_errno (error, errno); - goto out; - } - } - else - { - break; - } - } - if (i >= 128) - { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, - "Exhausted 128 attempts to create a temporary file"); - goto out; - } - - ret = TRUE; - ot_transfer_out_value(out_file, &possible_file); - out: - if (tmp_name) - g_string_free (tmp_name, TRUE); - return ret; -} - gboolean ostree_read_pack_entry_raw (guchar *pack_data, guint64 pack_len, diff --git a/src/libostree/ostree-core.h b/src/libostree/ostree-core.h index d3491e57..bc08d387 100644 --- a/src/libostree/ostree-core.h +++ b/src/libostree/ostree-core.h @@ -297,14 +297,6 @@ gboolean ostree_create_temp_regular_file (GFile *dir, GCancellable *cancellable, GError **error); -gboolean ostree_create_temp_hardlink (GFile *dir, - GFile *src, - const char *prefix, - const char *suffix, - GFile **out_file, - GCancellable *cancellable, - GError **error); - gboolean ostree_read_pack_entry_raw (guchar *pack_data, guint64 pack_len, guint64 object_offset,