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/fontmap.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/fontmap.c')
-rw-r--r-- | backend/dvi/mdvi-lib/fontmap.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/backend/dvi/mdvi-lib/fontmap.c b/backend/dvi/mdvi-lib/fontmap.c index 88ba89f..e186bd4 100644 --- a/backend/dvi/mdvi-lib/fontmap.c +++ b/backend/dvi/mdvi-lib/fontmap.c @@ -586,7 +586,7 @@ DviFontMapEnt *mdvi_load_fontmap(const char *file) } if(ent->encfile && enc){ if(ent->encoding && !STREQ(ent->encoding, enc->name)) { - warning( + mdvi_warning( _("%s: %d: [%s] requested encoding `%s' does not match vector `%s'\n"), file, lineno, ent->encfile, ent->encoding, enc->name); @@ -749,7 +749,7 @@ static int mdvi_init_fontmaps(void) DEBUG((DBG_FMAP, "%s: loading fontmap\n", arg)); ent = mdvi_load_fontmap(arg); if(ent == NULL) - warning(_("%s: could not load fontmap\n"), arg); + mdvi_warning(_("%s: could not load fontmap\n"), arg); else { DEBUG((DBG_FMAP, "%s: installing fontmap\n", arg)); @@ -763,8 +763,8 @@ static int mdvi_init_fontmaps(void) } else if(STRNEQ(line, "default-encoding", 16)) { arg = getstring(line + 16, " \t", &line); *line = 0; if(mdvi_set_default_encoding(arg) < 0) - warning(_("%s: could not set as default encoding\n"), - arg); + mdvi_warning(_("%s: could not set as default encoding\n"), + arg); } else if(STRNEQ(line, "psfontpath", 10)) { arg = getstring(line + 11, " \t", &line); *line = 0; if(!psinitialized) @@ -782,8 +782,8 @@ static int mdvi_init_fontmaps(void) } else if(STRNEQ(line, "psfontmap", 9)) { arg = getstring(line + 9, " \t", &line); *line = 0; if(mdvi_ps_read_fontmap(arg) < 0) - warning("%s: %s: could not read PS fontmap\n", - config, arg); + mdvi_warning("%s: %s: could not read PS fontmap\n", + config, arg); } } fclose(in); @@ -842,8 +842,8 @@ void mdvi_flush_encodings(void) for(; (enc = (DviEncoding *)encodings.head); ) { encodings.head = LIST(enc->next); if((enc != tex_text_encoding && enc->links) || enc->links > 1) { - warning(_("encoding vector `%s' is in use\n"), - enc->name); + mdvi_warning(_("encoding vector `%s' is in use\n"), + enc->name); } destroy_encoding(enc); } |