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/pk.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/pk.c')
| -rw-r--r-- | backend/dvi/mdvi-lib/pk.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/backend/dvi/mdvi-lib/pk.c b/backend/dvi/mdvi-lib/pk.c index 39064a1..98ef26b 100644 --- a/backend/dvi/mdvi-lib/pk.c +++ b/backend/dvi/mdvi-lib/pk.c @@ -307,7 +307,7 @@ static BITMAP *get_packed(FILE *p, int w, int h, int flags) paint = !paint; } if(row != h || inrow != w) { - error(_("Bad PK file: More bits than required\n")); + mdvi_error(_("Bad PK file: More bits than required\n")); bitmap_destroy(bm); return NULL; } @@ -360,8 +360,8 @@ static int pk_load_font(DviParams *unused, DviFont *font) /* get the checksum */ checksum = fuget4(p); if(checksum && font->checksum && font->checksum != 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; /* skip pixel per point ratios */ @@ -417,7 +417,7 @@ static int pk_load_font(DviParams *unused, DviFont *font) case PK_NOOP: break; case PK_PRE: - error(_("%s: unexpected preamble\n"), font->fontname); + mdvi_error(_("%s: unexpected preamble\n"), font->fontname); goto error; } } else { @@ -500,13 +500,13 @@ static int pk_load_font(DviParams *unused, DviFont *font) } } if(flag_byte != PK_POST) { - error(_("%s: unexpected end of file (no postamble)\n"), - font->fontname); + mdvi_error(_("%s: unexpected end of file (no postamble)\n"), + font->fontname); goto error; } while((flag_byte = fuget1(p)) != EOF) { if(flag_byte != PK_NOOP) { - error(_("invalid PK file! (junk in postamble)\n")); + mdvi_error(_("invalid PK file! (junk in postamble)\n")); goto error; } } @@ -523,7 +523,7 @@ static int pk_load_font(DviParams *unused, DviFont *font) return 0; badpk: - error(_("%s: File corrupted, or not a PK file\n"), font->fontname); + mdvi_error(_("%s: File corrupted, or not a PK file\n"), font->fontname); error: mdvi_free(font->chars); font->chars = NULL; |