summaryrefslogtreecommitdiff
path: root/libguile/objprop.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2011-05-01 21:00:54 +0200
committerAndy Wingo <wingo@pobox.com>2011-05-01 23:01:09 +0200
commit1ad9fdb727ef4e49f8d624b655cfc38c2f757e22 (patch)
tree58ff5b5e361ccff6705bd5fdec141e5e160c8363 /libguile/objprop.c
parent4466db75daa6ebee48a889f79046b1f4fb22c75a (diff)
downloadguile-1ad9fdb727ef4e49f8d624b655cfc38c2f757e22.tar.gz
fix scm_object_property_set_x for handles and weak tables
* libguile/objprop.c (scm_object_property_set_x): Use ref and set! instead of create-handle and set-cdr!, as it is a weak hash table. (scm_set_object_properties_x): Likewise.
Diffstat (limited to 'libguile/objprop.c')
-rw-r--r--libguile/objprop.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/libguile/objprop.c b/libguile/objprop.c
index dfa849441..7b50d71d0 100644
--- a/libguile/objprop.c
+++ b/libguile/objprop.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996, 2000, 2001, 2003, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996, 2000, 2001, 2003, 2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -59,11 +59,8 @@ SCM_DEFINE (scm_set_object_properties_x, "set-object-properties!", 2, 0, 0,
"Set @var{obj}'s property list to @var{alist}.")
#define FUNC_NAME s_scm_set_object_properties_x
{
- SCM handle;
-
scm_i_pthread_mutex_lock (&whash_mutex);
- handle = scm_hashq_create_handle_x (object_whash, obj, alist);
- SCM_SETCDR (handle, alist);
+ scm_hashq_set_x (object_whash, obj, alist);
scm_i_pthread_mutex_unlock (&whash_mutex);
return alist;
@@ -87,19 +84,16 @@ SCM_DEFINE (scm_set_object_property_x, "set-object-property!", 3, 0, 0,
"to @var{value}.")
#define FUNC_NAME s_scm_set_object_property_x
{
- SCM h;
+ SCM alist;
SCM assoc;
scm_i_pthread_mutex_lock (&whash_mutex);
- h = scm_hashq_create_handle_x (object_whash, obj, SCM_EOL);
- assoc = scm_assq (key, SCM_CDR (h));
+ alist = scm_hashq_ref (object_whash, obj, SCM_EOL);
+ assoc = scm_assq (key, alist);
if (SCM_NIMP (assoc))
SCM_SETCDR (assoc, value);
else
- {
- assoc = scm_acons (key, value, SCM_CDR (h));
- SCM_SETCDR (h, assoc);
- }
+ scm_hashq_set_x (object_whash, obj, scm_acons (key, value, alist));
scm_i_pthread_mutex_unlock (&whash_mutex);
return value;