summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipsk/tfmload.c
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-03-28 18:10:43 +0000
committerKarl Berry <karl@freefriends.org>2010-03-28 18:10:43 +0000
commit549a764cf19a1f244d773ab70965eadeef67d5a8 (patch)
treec90c4d213a075a429e17379467eac19282617252 /Build/source/texk/dvipsk/tfmload.c
parent1cf5d119a011d9d22145848f7177f3124f7e776c (diff)
dynamically concatenate more error strings
git-svn-id: svn://tug.org/texlive/trunk@17591 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipsk/tfmload.c')
-rw-r--r--Build/source/texk/dvipsk/tfmload.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/Build/source/texk/dvipsk/tfmload.c b/Build/source/texk/dvipsk/tfmload.c
index 04326c5fab6..6bd2febb089 100644
--- a/Build/source/texk/dvipsk/tfmload.c
+++ b/Build/source/texk/dvipsk/tfmload.c
@@ -4,6 +4,7 @@
#include "dvips.h" /* The copyright notice in that file is included too! */
#ifdef KPATHSEA
#include <kpathsea/c-pathmx.h>
+#include <kpathsea/concatn.h>
#endif
/*
* The external declarations:
@@ -20,8 +21,8 @@ static char name[50] ;
void
badtfm(const char *s)
{
- (void)sprintf(errbuf,"! Bad TFM file %s: %s",name,s) ;
- error(errbuf);
+ char *msg = concatn ("! Bad TFM file ", name, ": ", s);
+ error(msg);
}
/*
@@ -153,10 +154,10 @@ tfmload(register fontdesctype *curfnt)
li = tfm32() ;
check_checksum (li, curfnt->checksum, curfnt->name);
li = (integer)(alpha * (real)tfm32()) ;
- if (li > curfnt->designsize + fsizetol ||
- li < curfnt->designsize - fsizetol) {
- (void)sprintf(errbuf,"Design size mismatch in %s", name) ;
- error(errbuf) ;
+ if (li > curfnt->designsize + fsizetol
+ || li < curfnt->designsize - fsizetol) {
+ char *msg = concat ("Design size mismatch in font ", curfnt->name);
+ error(msg);
}
pretend_no_chars=ec+1 ;
if (pretend_no_chars<256) pretend_no_chars=256 ;
@@ -194,8 +195,8 @@ tfmload(register fontdesctype *curfnt)
}
}
if (font_level==1&&ncw!=0) {
- sprintf(errbuf, "Table size mismatch in %s", curfnt->name) ;
- error(errbuf) ;
+ char *msg = ("Table size mismatch in ", curfnt->name);
+ error(errbuf);
}
scaledsize = curfnt->scaledsize ;
scaled = (integer *) xmalloc(nw*sizeof(integer)) ;