[ostree] core: Use global random object
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] core: Use global random object
- Date: Thu, 22 Dec 2011 16:24:17 +0000 (UTC)
commit 9bcd4ff8aa6b8acd06e9cffd00c1cbd76df5fe7c
Author: Colin Walters <walters verbum org>
Date: Thu Dec 22 11:23:16 2011 -0500
core: Use global random object
We were pointlessly creating a new rand (and thus opening /dev/random)
on every temp file creation, but still using the global rand.
src/libostree/ostree-core.c | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c
index 3c9e11d..fcda638 100644
--- a/src/libostree/ostree-core.c
+++ b/src/libostree/ostree-core.c
@@ -822,8 +822,7 @@ create_tmp_string (const char *dirpath,
}
static char *
-subst_xxxxxx (GRand *rand,
- const char *string)
+subst_xxxxxx (const char *string)
{
static const char table[] = "ABCEDEFGHIJKLMNOPQRSTUVWXYZabcedefghijklmnopqrstuvwxyz0123456789";
char *ret = g_strdup (string);
@@ -856,15 +855,12 @@ ostree_create_temp_file_from_input (GFile *dir,
{
gboolean ret = FALSE;
GChecksum *ret_checksum = NULL;
- GRand *rand = NULL;
GString *tmp_name = NULL;
char *possible_name = NULL;
GFile *possible_file = NULL;
GError *temp_error = NULL;
int i = 0;
- rand = g_rand_new ();
-
tmp_name = create_tmp_string (ot_gfile_get_path_cached (dir),
prefix, suffix);
@@ -872,7 +868,7 @@ ostree_create_temp_file_from_input (GFile *dir,
for (i = 0; i < 128; i++)
{
g_free (possible_name);
- possible_name = subst_xxxxxx (rand, tmp_name->str);
+ possible_name = subst_xxxxxx (tmp_name->str);
g_clear_object (&possible_file);
possible_file = ot_gfile_new_for_path (possible_name);
@@ -908,8 +904,6 @@ ostree_create_temp_file_from_input (GFile *dir,
ot_transfer_out_value(out_checksum, &ret_checksum);
ot_transfer_out_value(out_file, &possible_file);
out:
- if (rand)
- g_rand_free (rand);
if (tmp_name)
g_string_free (tmp_name, TRUE);
g_free (possible_name);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]