summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfmx/src/fontmap.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/fontmap.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/fontmap.c')
-rw-r--r--Build/source/texk/dvipdfmx/src/fontmap.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/Build/source/texk/dvipdfmx/src/fontmap.c b/Build/source/texk/dvipdfmx/src/fontmap.c
index 76cfc8ad57d..2813fbc16c7 100644
--- a/Build/source/texk/dvipdfmx/src/fontmap.c
+++ b/Build/source/texk/dvipdfmx/src/fontmap.c
@@ -1,4 +1,4 @@
-/* $Header: /home/cvsroot/dvipdfmx/src/fontmap.c,v 1.41 2008/11/30 21:12:27 matthias Exp $
+/* $Header: /home/cvsroot/dvipdfmx/src/fontmap.c,v 1.42 2009/09/18 23:56:02 matthias Exp $
This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
@@ -743,7 +743,7 @@ pdf_append_fontmap_record (const char *kp, const fontmap_rec *vp)
mrec->map_name = mstrdup(kp); /* link */
mrec->charmap.sfd_name = mstrdup(sfd_name);
mrec->charmap.subfont_id = mstrdup(subfont_ids[n]);
- ht_insert_table(fontmap, tfm_name, strlen(tfm_name), mrec, hval_free);
+ ht_insert_table(fontmap, tfm_name, strlen(tfm_name), mrec);
}
RELEASE(tfm_name);
}
@@ -759,7 +759,7 @@ pdf_append_fontmap_record (const char *kp, const fontmap_rec *vp)
RELEASE(mrec->map_name);
mrec->map_name = NULL;
}
- ht_insert_table(fontmap, kp, strlen(kp), mrec, hval_free);
+ ht_insert_table(fontmap, kp, strlen(kp), mrec);
}
if (verbose > 3)
MESG("\n");
@@ -794,14 +794,14 @@ pdf_remove_fontmap_record (const char *kp)
continue;
if (verbose > 3)
MESG(" %s", tfm_name);
- ht_remove_table(fontmap, tfm_name, strlen(tfm_name), hval_free);
+ ht_remove_table(fontmap, tfm_name, strlen(tfm_name));
RELEASE(tfm_name);
}
RELEASE(fnt_name);
RELEASE(sfd_name);
}
- ht_remove_table(fontmap, kp, strlen(kp), hval_free);
+ ht_remove_table(fontmap, kp, strlen(kp));
if (verbose > 3)
MESG("\n");
@@ -847,7 +847,7 @@ pdf_insert_fontmap_record (const char *kp, const fontmap_rec *vp)
mrec->map_name = mstrdup(kp); /* link to this entry */
mrec->charmap.sfd_name = mstrdup(sfd_name);
mrec->charmap.subfont_id = mstrdup(subfont_ids[n]);
- ht_insert_table(fontmap, tfm_name, strlen(tfm_name), mrec, hval_free);
+ ht_insert_table(fontmap, tfm_name, strlen(tfm_name), mrec);
RELEASE(tfm_name);
}
RELEASE(fnt_name);
@@ -860,7 +860,7 @@ pdf_insert_fontmap_record (const char *kp, const fontmap_rec *vp)
RELEASE(mrec->map_name);
mrec->map_name = NULL;
}
- ht_insert_table(fontmap, kp, strlen(kp), mrec, hval_free);
+ ht_insert_table(fontmap, kp, strlen(kp), mrec);
if (verbose > 3)
MESG("\n");
@@ -1101,14 +1101,14 @@ void
pdf_init_fontmaps (void)
{
fontmap = NEW(1, struct ht_table);
- ht_init_table(fontmap);
+ ht_init_table(fontmap, hval_free);
}
void
pdf_close_fontmaps (void)
{
if (fontmap) {
- ht_clear_table(fontmap, hval_free);
+ ht_clear_table(fontmap);
RELEASE(fontmap);
}
fontmap = NULL;