summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfmx/src/pdfnames.c
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-04-05 00:34:08 +0000
committerKarl Berry <karl@freefriends.org>2010-04-05 00:34:08 +0000
commit48ea893cd463bd15617d436f31113b64173f2fc5 (patch)
tree3892eb0cb1298c9740316aca3ec5258a0e2e9266 /Build/source/texk/dvipdfmx/src/pdfnames.c
parentb9337f4db98cc2f48a8d8a11f91b601ffe0b1fba (diff)
attempt to update to dvipdfmx-20100328, while preserving const changes
git-svn-id: svn://tug.org/texlive/trunk@17693 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfmx/src/pdfnames.c')
-rw-r--r--Build/source/texk/dvipdfmx/src/pdfnames.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/Build/source/texk/dvipdfmx/src/pdfnames.c b/Build/source/texk/dvipdfmx/src/pdfnames.c
index 905664cc948..16468b24bb8 100644
--- a/Build/source/texk/dvipdfmx/src/pdfnames.c
+++ b/Build/source/texk/dvipdfmx/src/pdfnames.c
@@ -1,4 +1,4 @@
-/* $Header: /home/cvsroot/dvipdfmx/src/pdfnames.c,v 1.6 2009/04/26 21:23:29 matthias Exp $
+/* $Header: /home/cvsroot/dvipdfmx/src/pdfnames.c,v 1.7 2009/09/18 23:56:02 matthias Exp $
This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
@@ -73,13 +73,30 @@ printable_key (const char *key, int keylen)
return (char *) pkey;
}
+static void CDECL
+hval_free (void *hval)
+{
+ struct obj_data *value;
+
+ value = (struct obj_data *) hval;
+
+ if (value->object) {
+ pdf_release_obj(value->object);
+ value->object = NULL;
+ }
+
+ RELEASE(value);
+
+ return;
+}
+
struct ht_table *
pdf_new_name_tree (void)
{
struct ht_table *names;
names = NEW(1, struct ht_table);
- ht_init_table(names);
+ ht_init_table(names, hval_free);
return names;
}
@@ -108,23 +125,6 @@ check_objects_defined (struct ht_table *ht_tab)
}
}
-static void CDECL
-hval_free (void *hval)
-{
- struct obj_data *value;
-
- value = (struct obj_data *) hval;
-
- if (value->object) {
- pdf_release_obj(value->object);
- value->object = NULL;
- }
-
- RELEASE(value);
-
- return;
-}
-
void
pdf_delete_name_tree (struct ht_table **names)
{
@@ -132,7 +132,7 @@ pdf_delete_name_tree (struct ht_table **names)
check_objects_defined(*names);
- ht_clear_table(*names, hval_free);
+ ht_clear_table(*names);
RELEASE(*names);
*names = NULL;
}