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/tfmfile.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/tfmfile.c')
-rw-r--r-- | backend/dvi/mdvi-lib/tfmfile.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/backend/dvi/mdvi-lib/tfmfile.c b/backend/dvi/mdvi-lib/tfmfile.c index 36568bd..cab4f19 100644 --- a/backend/dvi/mdvi-lib/tfmfile.c +++ b/backend/dvi/mdvi-lib/tfmfile.c @@ -88,7 +88,7 @@ int afm_load_file(const char *filename, TFMInfo *info) fclose(in); if(status != ok) { - error(_("%s: Error reading AFM data\n"), filename); + mdvi_error(_("%s: Error reading AFM data\n"), filename); return -1; } @@ -178,8 +178,8 @@ int tfm_load_file(const char *filename, TFMInfo *info) /* allocate a word-aligned buffer to hold the file */ size = 4 * ROUND(st.st_size, 4); if(size != st.st_size) - warning(_("Warning: TFM file `%s' has suspicious size\n"), - filename); + mdvi_warning(_("Warning: TFM file `%s' has suspicious size\n"), + filename); tfm = (Uchar *)mdvi_malloc(size); if(fread(tfm, st.st_size, 1, in) != 1) goto error; @@ -228,8 +228,8 @@ int tfm_load_file(const char *filename, TFMInfo *info) /* get the coding scheme */ i = n = msget1(ptr); if(n < 0 || n > 39) { - warning(_("%s: font coding scheme truncated to 40 bytes\n"), - filename); + mdvi_warning(_("%s: font coding scheme truncated to 40 bytes\n"), + filename); n = 39; } memcpy(info->coding, ptr, n); @@ -288,7 +288,7 @@ int tfm_load_file(const char *filename, TFMInfo *info) return 0; bad_tfm: - error(_("%s: File corrupted, or not a TFM file\n"), filename); + mdvi_error(_("%s: File corrupted, or not a TFM file\n"), filename); error: if(tfm) mdvi_free(tfm); if(in) fclose(in); @@ -509,8 +509,8 @@ static int ofm_load_file(const char *filename, TFMInfo *info) /* get the coding scheme */ i = n = fsget1(in); if(n < 0 || n > 39) { - warning(_("%s: font coding scheme truncated to 40 bytes\n"), - filename); + mdvi_warning(_("%s: font coding scheme truncated to 40 bytes\n"), + filename); n = 39; } fread(info->coding, 39, 1, in); @@ -587,7 +587,7 @@ static int ofm_load_file(const char *filename, TFMInfo *info) return 0; bad_tfm: - error(_("%s: File corrupted, or not a TFM file\n"), filename); + mdvi_error(_("%s: File corrupted, or not a TFM file\n"), filename); fclose(in); return -1; } |