diff options
| author | Carlos Garcia Campos <carlosgc@gnome.org> | 2008-09-28 16:55:50 (GMT) |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@src.gnome.org> | 2008-09-28 16:55:50 (GMT) |
| commit | 14def5e0c1c11cee1523e10c72df74f4cf5e451d (patch) | |
| tree | 7a263a5d7bc57842f18066c166be63c18bab97ca /backend/dvi/mdvi-lib/vf.c | |
| parent | 5ecba587abf52861a6283db328a87d240cd751ce (diff) | |
Rename error as mdvi_error to avoid symbol conflicts with the libc error.
2008-09-28 Carlos Garcia Campos <carlosgc@gnome.org>
* backend/dvi/mdvi-lib/common.h:
* backend/dvi/mdvi-lib/dviread.c:
* backend/dvi/mdvi-lib/font.c:
* backend/dvi/mdvi-lib/fontmap.c:
* backend/dvi/mdvi-lib/fontsrch.c:
* backend/dvi/mdvi-lib/gf.c:
* backend/dvi/mdvi-lib/pagesel.c:
* backend/dvi/mdvi-lib/pk.c:
* backend/dvi/mdvi-lib/sp-epsf.c:
* backend/dvi/mdvi-lib/special.c:
* backend/dvi/mdvi-lib/tfm.c:
* backend/dvi/mdvi-lib/tfmfile.c:
* backend/dvi/mdvi-lib/util.c:
* backend/dvi/mdvi-lib/vf.c:
Rename error as mdvi_error to avoid symbol conflicts with the libc
error. Rename also message, crash, fatal and warning for
consistency. Fixes bug #553369.
svn path=/trunk/; revision=3210
Diffstat (limited to 'backend/dvi/mdvi-lib/vf.c')
| -rw-r--r-- | backend/dvi/mdvi-lib/vf.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/backend/dvi/mdvi-lib/vf.c b/backend/dvi/mdvi-lib/vf.c index 640077a..3826ae8 100644 --- a/backend/dvi/mdvi-lib/vf.c +++ b/backend/dvi/mdvi-lib/vf.c @@ -79,8 +79,8 @@ static int vf_load_font(DviParams *params, DviFont *font) fseek(p, (long)mlen, SEEK_CUR); checksum = fuget4(p); if(checksum && font->checksum && checksum != font->checksum) { - warning(_("%s: Checksum mismatch (expected %u, got %u)\n"), - font->fontname, font->checksum, checksum); + mdvi_warning(_("%s: Checksum mismatch (expected %u, got %u)\n"), + font->fontname, font->checksum, checksum); } else if(!font->checksum) font->checksum = checksum; font->design = fuget4(p); @@ -127,8 +127,8 @@ static int vf_load_font(DviParams *params, DviFont *font) /* get the font */ ref = font_reference(params, id, name, checksum, hdpi, vdpi, scale); if(ref == NULL) { - error(_("(vf) %s: could not load font `%s'\n"), - font->fontname, name); + mdvi_error(_("(vf) %s: could not load font `%s'\n"), + font->fontname, name); goto error; } mdvi_free(name); @@ -177,8 +177,8 @@ static int vf_load_font(DviParams *params, DviFont *font) nchars = cc + 16; } if(font->chars[cc].offset) { - error(_("(vf) %s: character %d redefined\n"), - font->fontname, cc); + mdvi_error(_("(vf) %s: character %d redefined\n"), + font->fontname, cc); goto error; } @@ -200,7 +200,7 @@ static int vf_load_font(DviParams *params, DviFont *font) op = fuget1(p); } if(op != 248) { - error(_("(vf) %s: no postamble\n"), font->fontname); + mdvi_error(_("(vf) %s: no postamble\n"), font->fontname); goto error; } @@ -226,7 +226,7 @@ static int vf_load_font(DviParams *params, DviFont *font) return 0; badvf: - error(_("%s: File corrupted, or not a VF file.\n"), font->fontname); + mdvi_error(_("%s: File corrupted, or not a VF file.\n"), font->fontname); error: if(font->chars) mdvi_free(font->chars); |