diff options
Diffstat (limited to 'Build/source/texk/web2c/pdftexdir/ttf2afm.c')
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/ttf2afm.c | 51 |
1 files changed, 28 insertions, 23 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ttf2afm.c b/Build/source/texk/web2c/pdftexdir/ttf2afm.c index 482ca875db5..0e3a0c30244 100644 --- a/Build/source/texk/web2c/pdftexdir/ttf2afm.c +++ b/Build/source/texk/web2c/pdftexdir/ttf2afm.c @@ -130,7 +130,10 @@ TTF_USHORT unicode_map[0xFFFF]; #include "macnames.c" -void ttf_fail(char *fmt, ...) +#if defined __GNUC__ && __GNUC__ >=3 +__attribute__((__noreturn__)) +#endif +static void ttf_fail(const char *fmt, ...) { va_list args; va_start(args, fmt); @@ -144,7 +147,7 @@ void ttf_fail(char *fmt, ...) exit(-1); } -void ttf_warn(char *fmt, ...) +static void ttf_warn(const char *fmt, ...) { va_list args; va_start(args, fmt); @@ -157,7 +160,7 @@ void ttf_warn(char *fmt, ...) va_end(args); } -int xgetc(FILE * stream) +static int xgetc(FILE * stream) { int c = getc(stream); if (c < 0 && c != EOF) @@ -165,7 +168,7 @@ int xgetc(FILE * stream) return c; } -long ttf_getnum(int s) +static long ttf_getnum(int s) { long i = 0; int c; @@ -178,7 +181,7 @@ long ttf_getnum(int s) return i; } -dirtab_entry *name_lookup(char *s) +static dirtab_entry *name_lookup(const char *s) { dirtab_entry *p; for (p = dir_tab; p - dir_tab < ntabs; p++) @@ -189,7 +192,7 @@ dirtab_entry *name_lookup(char *s) return p; } -void ttf_seek_tab(char *name, TTF_LONG offset) +static void ttf_seek_tab(const char *name, TTF_LONG offset) { dirtab_entry *p = name_lookup(name); if (p == NULL) @@ -198,13 +201,13 @@ void ttf_seek_tab(char *name, TTF_LONG offset) ttf_fail("fseek() failed while reading `%s' table", name); } -void ttf_seek_off(char *name, TTF_LONG offset) +static void ttf_seek_off(const char *name, TTF_LONG offset) { if (fseek(fontfile, offset, SEEK_SET) < 0) ttf_fail("fseek() failed while reading `%s' table", name); } -void store_kern_value(TTF_USHORT i, TTF_USHORT j, TTF_FWORD v) +static void store_kern_value(TTF_USHORT i, TTF_USHORT j, TTF_FWORD v) { kern_entry *pk; for (pk = kern_tab + i; pk->next != NULL; pk = pk->next); @@ -215,7 +218,8 @@ void store_kern_value(TTF_USHORT i, TTF_USHORT j, TTF_FWORD v) pk->value = v; } -TTF_FWORD get_kern_value(TTF_USHORT i, TTF_USHORT j) +#if 0 /* unused */ +static TTF_FWORD get_kern_value(TTF_USHORT i, TTF_USHORT j) { kern_entry *pk; for (pk = kern_tab + i; pk->next != NULL; pk = pk->next) @@ -223,8 +227,9 @@ TTF_FWORD get_kern_value(TTF_USHORT i, TTF_USHORT j) return pk->value; return 0; } +#endif -void free_tabs() +static void free_tabs(void) { int i; kern_entry *p, *q, *r; @@ -256,7 +261,7 @@ void free_tabs() xfree(kern_tab); } -void enc_getline() +static void enc_getline(void) { char *p; int c; @@ -273,7 +278,7 @@ void enc_getline() goto restart; } -void read_encoding(char *encname) +static void read_encoding(char *encname) { char buf[ENC_BUF_SIZE], *q, *r; int i; @@ -319,7 +324,7 @@ void read_encoding(char *encname) names_count, 256); } -void append_unicode(long glyph_index, TTF_USHORT code) +static void append_unicode(long glyph_index, TTF_USHORT code) { mtx_entry *m; unicode_entry *u, *v; @@ -336,7 +341,7 @@ void append_unicode(long glyph_index, TTF_USHORT code) } } -void read_cmap() +static void read_cmap(void) { cmap_entry *e; seg_entry *seg_tab, *s; @@ -423,7 +428,7 @@ void read_cmap() select_unicode, unicode_map_count); } -void read_font() +static void read_font(void) { long i, j, k, l, n, m, platform_id, encoding_id; TTF_FWORD kern_value; @@ -487,7 +492,7 @@ void read_font() switch (post_format) { case 0x00010000: for (pm = mtx_tab; pm - mtx_tab < NMACGLYPHS; pm++) - pm->name = (char *) mac_glyph_names[pm - mtx_tab]; + pm->name = mac_glyph_names[pm - mtx_tab]; break; case 0x00020000: l = get_ushort(); /* some fonts have this value different from nglyphs */ @@ -505,7 +510,7 @@ void read_font() } for (pm = mtx_tab; pm - mtx_tab < l; pm++) { if (pm->index < NMACGLYPHS) - pm->name = (char *) mac_glyph_names[pm->index]; + pm->name = mac_glyph_names[pm->index]; else { k = pm->index - NMACGLYPHS; if (k < m) { @@ -675,7 +680,7 @@ void read_font() } } -int null_glyph(const char *s) +static int null_glyph(const char *s) { return (s == NULL || s == notdef); /* @@ -686,7 +691,7 @@ int null_glyph(const char *s) */ } -void print_glyph_name(FILE * f, long glyph_index, int convention) +static void print_glyph_name(FILE * f, long glyph_index, int convention) { unicode_entry *u; static char buf[1024]; @@ -732,7 +737,7 @@ void print_glyph_name(FILE * f, long glyph_index, int convention) } } -void print_char_metric(FILE * f, int charcode, long glyph_index) +static void print_char_metric(FILE * f, int charcode, long glyph_index) { assert(glyph_index >= 0 && glyph_index < nglyphs); fprintf(f, "C %i ; WX %i ; N ", (int) charcode, @@ -745,7 +750,7 @@ void print_char_metric(FILE * f, int charcode, long glyph_index) (int) get_ttf_funit(mtx_tab[glyph_index].bbox[3])); } -void print_afm(char *date, char *fontname) +static void print_afm(char *date, char *fontname) { int ncharmetrics; mtx_entry *pm; @@ -850,7 +855,7 @@ void print_afm(char *date, char *fontname) fputs("EndFontMetrics\n", outfile); } -void print_encoding(char *fontname) +static void print_encoding(char *fontname) { long int i, k, first_code, length; FILE *file; @@ -961,7 +966,7 @@ void print_encoding(char *fontname) xfree(enc_name); } -void usage() +static void usage(void) { cur_file_name = NULL; fprintf(stderr, |