diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-09-18 17:17:57 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-09-18 17:17:57 +0000 |
commit | ca86fb03187e2e7822b78e50cd39b8583bacd0e2 (patch) | |
tree | e87eb946f580799d1162335b73b4122a235605b3 /Build/source/texk/makejvf/tfmread.c | |
parent | e819cecc04df73c709499de7352d79a6384e00d6 (diff) |
makejvf: Remove W32TeX/TL diffs (from Akira)
Use xmalloc() and xstrdup()
Use getopt() to parse options, avoiding segmentation fault for missing parameters
git-svn-id: svn://tug.org/texlive/trunk@27695 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/makejvf/tfmread.c')
-rw-r--r-- | Build/source/texk/makejvf/tfmread.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Build/source/texk/makejvf/tfmread.c b/Build/source/texk/makejvf/tfmread.c index 40323a73c63..f9046c0aeb4 100644 --- a/Build/source/texk/makejvf/tfmread.c +++ b/Build/source/texk/makejvf/tfmread.c @@ -2,7 +2,7 @@ #include <stdlib.h> #include <string.h> -#include <kpathsea/config.h> +#include <kpathsea/kpathsea.h> #include "makejvf.h" int nt,unit,zh,zw,jfm_id; @@ -72,32 +72,32 @@ int tfmidx(FILE *fp) ng = ufpair(fp); np = ufpair(fp); - header = malloc(lh*4); + header = xmalloc(lh*4); for (i = 0 ; i < lh*4 ; i++) { header[i] = fgetc(fp); } - char_type = malloc(nt*4); + char_type = xmalloc(nt*4); for (i = 0 ; i < nt*4 ; i++) { char_type[i] = fgetc(fp); } - char_info = malloc((ec+1)*4); + char_info = xmalloc((ec+1)*4); for (i = 0 ; i < (ec+1)*4 ; i++) { char_info[i] = fgetc(fp); } - width = malloc(nw*sizeof(int)); + width = xmalloc(nw*sizeof(int)); for (i = 0 ; i < nw ; i++) { width[i] = fquad(fp); } - height = malloc(nh*sizeof(int)); + height = xmalloc(nh*sizeof(int)); for (i = 0 ; i < nh ; i++) { height[i] = fquad(fp); } - depth = malloc(nd*sizeof(int)); + depth = xmalloc(nd*sizeof(int)); for (i = 0 ; i < nd ; i++) { depth[i] = fquad(fp); } fseek(fp,(ni+nl+nk+ng)*4,SEEK_CUR); - param = malloc(np*sizeof(int)); + param = xmalloc(np*sizeof(int)); for (i = 0 ; i < np ; i++) { param[i] = fquad(fp); } |