diff options
author | Nickolay V. Shmyrev <nshmyrev@src.gnome.org> | 2005-06-23 21:05:32 (GMT) |
---|---|---|
committer | Nickolay V. Shmyrev <nshmyrev@src.gnome.org> | 2005-06-23 21:05:32 (GMT) |
commit | a8e6dab2d1f20a861df947c5705b6bbd0cb81c1a (patch) | |
tree | cdea106e2e1798cba68d4e492e724b832ab6411d /dvi/mdvi-lib/vf.c | |
parent | 1f82fa9589a57a49476066010861a0dae84f39a1 (diff) |
Rename xmalloc to mdvi_malloc to avoid libtool conflict, update year in
copyright.
Diffstat (limited to 'dvi/mdvi-lib/vf.c')
-rw-r--r-- | dvi/mdvi-lib/vf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dvi/mdvi-lib/vf.c b/dvi/mdvi-lib/vf.c index 86185f3..e1397fd 100644 --- a/dvi/mdvi-lib/vf.c +++ b/dvi/mdvi-lib/vf.c @@ -116,7 +116,7 @@ static int vf_load_font(DviParams *params, DviFont *font) hdpi = FROUND(params->mag * params->dpi * scale / design); vdpi = FROUND(params->mag * params->vdpi * scale / design); n = fuget1(p) + fuget1(p); - name = xmalloc(n + 1); + name = mdvi_malloc(n + 1); fread(name, 1, n, p); name[n] = 0; DEBUG((DBG_FONTS, "(vf) %s: defined font `%s' at %.1fpt (%dx%d dpi)\n", @@ -130,7 +130,7 @@ static int vf_load_font(DviParams *params, DviFont *font) font->fontname, name); goto error; } - xfree(name); + mdvi_free(name); if(last == NULL) font->subfonts = last = ref; else @@ -228,13 +228,13 @@ badvf: error(_("%s: File corrupted, or not a VF file.\n"), font->fontname); error: if(font->chars) - xfree(font->chars); + mdvi_free(font->chars); if(macros) - xfree(macros); + mdvi_free(macros); return -1; } static void vf_free_macros(DviFont *font) { - xfree(font->private); + mdvi_free(font->private); } |