summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfmx/src
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-11-10 10:30:17 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-11-10 10:30:17 +0000
commitac4c4a45682b1157c58076c40c943a3d9a2cad77 (patch)
tree2bf13ce5c730f42f654abf500e95ce60ecf4bd4c /Build/source/texk/dvipdfmx/src
parentc7373aea6badf4ce6e1bca4a5335b89569d5c8a5 (diff)
towards TL2010: texk/dvipdfmx
git-svn-id: svn://tug.org/texlive/trunk@15972 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfmx/src')
-rw-r--r--Build/source/texk/dvipdfmx/src/Makefile.in6
-rw-r--r--Build/source/texk/dvipdfmx/src/agl.c35
-rw-r--r--Build/source/texk/dvipdfmx/src/cff.c2
-rw-r--r--Build/source/texk/dvipdfmx/src/cff.h2
-rw-r--r--Build/source/texk/dvipdfmx/src/cff_dict.c4
-rw-r--r--Build/source/texk/dvipdfmx/src/cff_types.h2
-rw-r--r--Build/source/texk/dvipdfmx/src/cid.c4
-rw-r--r--Build/source/texk/dvipdfmx/src/cidtype0.c8
-rw-r--r--Build/source/texk/dvipdfmx/src/cidtype2.c6
-rw-r--r--Build/source/texk/dvipdfmx/src/cmap.c5
-rw-r--r--Build/source/texk/dvipdfmx/src/cmap_write.c2
-rw-r--r--Build/source/texk/dvipdfmx/src/dpxcrypt.c6
-rw-r--r--Build/source/texk/dvipdfmx/src/dpxcrypt.h2
-rw-r--r--Build/source/texk/dvipdfmx/src/dpxfile.c36
-rw-r--r--Build/source/texk/dvipdfmx/src/dpxutil.c22
-rw-r--r--Build/source/texk/dvipdfmx/src/dpxutil.h6
-rw-r--r--Build/source/texk/dvipdfmx/src/dvi.c13
-rw-r--r--Build/source/texk/dvipdfmx/src/dvipdfmx.c19
-rw-r--r--Build/source/texk/dvipdfmx/src/fontmap.c51
-rw-r--r--Build/source/texk/dvipdfmx/src/mfileio.c2
-rw-r--r--Build/source/texk/dvipdfmx/src/mpost.c24
-rw-r--r--Build/source/texk/dvipdfmx/src/mpost.h4
-rw-r--r--Build/source/texk/dvipdfmx/src/otl_conf.c10
-rw-r--r--Build/source/texk/dvipdfmx/src/otl_opt.c6
-rw-r--r--Build/source/texk/dvipdfmx/src/pdfcolor.c20
-rw-r--r--Build/source/texk/dvipdfmx/src/pdfdev.c13
-rw-r--r--Build/source/texk/dvipdfmx/src/pdfdoc.c6
-rw-r--r--Build/source/texk/dvipdfmx/src/pdfencoding.c13
-rw-r--r--Build/source/texk/dvipdfmx/src/pdfencoding.h2
-rw-r--r--Build/source/texk/dvipdfmx/src/pdfencrypt.c2
-rw-r--r--Build/source/texk/dvipdfmx/src/pdfnames.c6
-rw-r--r--Build/source/texk/dvipdfmx/src/pdfobj.c55
-rw-r--r--Build/source/texk/dvipdfmx/src/pdfparse.c79
-rw-r--r--Build/source/texk/dvipdfmx/src/pdfparse.h40
-rw-r--r--Build/source/texk/dvipdfmx/src/pst_obj.c13
-rw-r--r--Build/source/texk/dvipdfmx/src/spc_color.c20
-rw-r--r--Build/source/texk/dvipdfmx/src/spc_dvips.c17
-rw-r--r--Build/source/texk/dvipdfmx/src/spc_html.c29
-rw-r--r--Build/source/texk/dvipdfmx/src/spc_misc.c12
-rw-r--r--Build/source/texk/dvipdfmx/src/spc_pdfm.c10
-rw-r--r--Build/source/texk/dvipdfmx/src/spc_tpic.c17
-rw-r--r--Build/source/texk/dvipdfmx/src/spc_util.c4
-rw-r--r--Build/source/texk/dvipdfmx/src/specials.c7
-rw-r--r--Build/source/texk/dvipdfmx/src/specials.h8
-rw-r--r--Build/source/texk/dvipdfmx/src/subfont.c9
-rw-r--r--Build/source/texk/dvipdfmx/src/t1_char.c6
-rw-r--r--Build/source/texk/dvipdfmx/src/t1_load.c4
-rw-r--r--Build/source/texk/dvipdfmx/src/t1_load.h2
-rw-r--r--Build/source/texk/dvipdfmx/src/truetype.c7
-rw-r--r--Build/source/texk/dvipdfmx/src/tt_glyf.c6
-rw-r--r--Build/source/texk/dvipdfmx/src/tt_post.c10
-rw-r--r--Build/source/texk/dvipdfmx/src/tt_post.h2
-rw-r--r--Build/source/texk/dvipdfmx/src/type1.c2
-rw-r--r--Build/source/texk/dvipdfmx/src/xbb.c2
54 files changed, 361 insertions, 339 deletions
diff --git a/Build/source/texk/dvipdfmx/src/Makefile.in b/Build/source/texk/dvipdfmx/src/Makefile.in
index 8e1e334465d..dd38212043b 100644
--- a/Build/source/texk/dvipdfmx/src/Makefile.in
+++ b/Build/source/texk/dvipdfmx/src/Makefile.in
@@ -40,8 +40,7 @@ subdir = src
DIST_COMMON = $(dist_bin_SCRIPTS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../../m4/cho-kpse.m4 \
- $(top_srcdir)/../../m4/cho-libs.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../../m4/cho-libs.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
@@ -52,7 +51,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/cho-kpse.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
$(top_srcdir)/../../m4/ltversion.m4 \
$(top_srcdir)/../../m4/lt~obsolete.m4 \
- $(top_srcdir)/../../m4/maw-time.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/../../build-aux/mkinstalldirs
@@ -184,6 +183,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
diff --git a/Build/source/texk/dvipdfmx/src/agl.c b/Build/source/texk/dvipdfmx/src/agl.c
index 815ccfd6ed5..0cbb262e63d 100644
--- a/Build/source/texk/dvipdfmx/src/agl.c
+++ b/Build/source/texk/dvipdfmx/src/agl.c
@@ -143,7 +143,7 @@ static const char * const modifiers[] = {
};
static int
-skip_capital (char **p, char *endptr)
+skip_capital (const char **p, const char *endptr)
{
long slen = 0, len;
@@ -178,7 +178,7 @@ skip_capital (char **p, char *endptr)
}
static int
-skip_modifier (char **p, char *endptr)
+skip_modifier (const char **p, const char *endptr)
{
long slen = 0, len;
int i;
@@ -201,12 +201,12 @@ static int
is_smallcap (const char *glyphname)
{
long len, slen;
- char *p, *endptr;
+ const char *p, *endptr;
if (!glyphname)
return 0;
- p = (char *) glyphname;
+ p = glyphname;
len = strlen(glyphname);
if (len < 6 ||
strcmp(p + len - 5, "small"))
@@ -395,7 +395,8 @@ int
agl_load_listfile (const char *filename, int is_predef)
{
int count = 0;
- char *p, *endptr, *nextptr;
+ const char *p, *endptr;
+ char *nextptr;
char wbuf[WBUF_SIZE];
FILE *fp;
@@ -558,7 +559,7 @@ long
agl_name_convert_unicode (const char *glyphname)
{
long ucv = -1;
- char *p;
+ const char *p;
if (!agl_name_is_unicode(glyphname))
return -1;
@@ -569,9 +570,9 @@ agl_name_convert_unicode (const char *glyphname)
}
if (glyphname[1] == 'n')
- p = (char *) (glyphname + 3);
+ p = glyphname + 3;
else
- p = (char *) (glyphname + 1);
+ p = glyphname + 1;
ucv = 0;
while (*p != '\0' && *p != '.') {
if (!isdigit(*p) && (*p < 'A' || *p > 'F')) {
@@ -626,10 +627,10 @@ static long
put_unicode_glyph (const char *name,
unsigned char **dstpp, unsigned char *limptr)
{
- char *p;
+ const char *p;
long len = 0, ucv;
- p = (char *) name;
+ p = name;
ucv = 0;
if (p[1] != 'n') {
@@ -655,17 +656,18 @@ agl_sput_UTF16BE (const char *glyphstr,
{
long len = 0;
int count = 0;
- char *p, *endptr;
+ const char *p, *endptr;
ASSERT(glyphstr && dstpp);
- p = (char *) glyphstr;
+ p = glyphstr;
endptr = strchr(p, '.');
if (!endptr)
endptr = p + strlen(p);
while (p < endptr) {
- char *name, *delim;
+ char *name;
+ const char *delim;
long sub_len;
int i;
agl_name *agln0, *agln1 = NULL;
@@ -736,15 +738,16 @@ agl_get_unicodes (const char *glyphstr,
long *unicodes, int max_unicodes)
{
int count = 0;
- char *p, *endptr;
+ const char *p, *endptr;
- p = (char *) glyphstr;
+ p = glyphstr;
endptr = strchr(p, '.');
if (!endptr)
endptr = p + strlen(p);
while (p < endptr) {
- char *name, *delim;
+ char *name;
+ const char *delim;
long sub_len;
int i;
agl_name *agln0, *agln1 = NULL;
diff --git a/Build/source/texk/dvipdfmx/src/cff.c b/Build/source/texk/dvipdfmx/src/cff.c
index 000334b64e4..e9b23b8403b 100644
--- a/Build/source/texk/dvipdfmx/src/cff.c
+++ b/Build/source/texk/dvipdfmx/src/cff.c
@@ -499,7 +499,7 @@ char *cff_get_string (cff_font *cff, s_SID id)
return result;
}
-long cff_get_sid (cff_font *cff, char *str)
+long cff_get_sid (cff_font *cff, const char *str)
{
card16 i;
diff --git a/Build/source/texk/dvipdfmx/src/cff.h b/Build/source/texk/dvipdfmx/src/cff.h
index 03174386ba0..dfebec3944f 100644
--- a/Build/source/texk/dvipdfmx/src/cff.h
+++ b/Build/source/texk/dvipdfmx/src/cff.h
@@ -136,7 +136,7 @@ extern long cff_read_private (cff_font *cff);
/* String */
extern int cff_match_string (cff_font *cff, const char *str, s_SID sid);
extern char *cff_get_string (cff_font *cff, s_SID id);
-extern long cff_get_sid (cff_font *cff, char *str);
+extern long cff_get_sid (cff_font *cff, const char *str);
extern s_SID cff_add_string (cff_font *cff, const char *str, int unique);
extern void cff_update_string (cff_font *cff);
diff --git a/Build/source/texk/dvipdfmx/src/cff_dict.c b/Build/source/texk/dvipdfmx/src/cff_dict.c
index 5d360e4ecfc..a324f7ca5a7 100644
--- a/Build/source/texk/dvipdfmx/src/cff_dict.c
+++ b/Build/source/texk/dvipdfmx/src/cff_dict.c
@@ -312,7 +312,7 @@ static void add_dict (cff_dict *dict,
}
(dict->entries)[dict->count].id = id;
- (dict->entries)[dict->count].key = (char *) dict_operator[id].opname;
+ (dict->entries)[dict->count].key = dict_operator[id].opname;
if (argtype == CFF_TYPE_NUMBER ||
argtype == CFF_TYPE_BOOLEAN ||
argtype == CFF_TYPE_SID ||
@@ -603,7 +603,7 @@ void cff_dict_add (cff_dict *dict, const char *key, int count)
}
(dict->entries)[dict->count].id = id;
- (dict->entries)[dict->count].key = (char *) dict_operator[id].opname;
+ (dict->entries)[dict->count].key = dict_operator[id].opname;
(dict->entries)[dict->count].count = count;
if (count > 0) {
(dict->entries)[dict->count].values = NEW(count, double);
diff --git a/Build/source/texk/dvipdfmx/src/cff_types.h b/Build/source/texk/dvipdfmx/src/cff_types.h
index ede20b64199..33173efebda 100644
--- a/Build/source/texk/dvipdfmx/src/cff_types.h
+++ b/Build/source/texk/dvipdfmx/src/cff_types.h
@@ -68,7 +68,7 @@ typedef struct {
/* Dictionary */
typedef struct {
int id; /* encoded data value (as card8 or card16) */
- char *key; /* opname */
+ const char *key; /* opname */
int count; /* number of values */
double *values; /* values */
} cff_dict_entry;
diff --git a/Build/source/texk/dvipdfmx/src/cid.c b/Build/source/texk/dvipdfmx/src/cid.c
index 3213e3aa102..1ad38d58c6a 100644
--- a/Build/source/texk/dvipdfmx/src/cid.c
+++ b/Build/source/texk/dvipdfmx/src/cid.c
@@ -428,10 +428,10 @@ CIDFont_base_open (CIDFont *font, const char *name, CIDSysInfo *cmap_csi, cid_op
start = cid_basefont[idx].fontdict;
end = start + strlen(start);
- fontdict = parse_pdf_dict((char **)&start, (char *)end, NULL);
+ fontdict = parse_pdf_dict(&start, end, NULL);
start = cid_basefont[idx].descriptor;
end = start + strlen(start);
- descriptor = parse_pdf_dict((char **)&start, (char *)end, NULL);
+ descriptor = parse_pdf_dict(&start, end, NULL);
ASSERT(fontdict && descriptor);
}
diff --git a/Build/source/texk/dvipdfmx/src/cidtype0.c b/Build/source/texk/dvipdfmx/src/cidtype0.c
index 5f61602ad6f..e7d9399f5c6 100644
--- a/Build/source/texk/dvipdfmx/src/cidtype0.c
+++ b/Build/source/texk/dvipdfmx/src/cidtype0.c
@@ -1072,9 +1072,9 @@ CIDFont_type0_t1cdofont (CIDFont *font)
/* CFF code need to be rewrote... */
cff_dict_add(cffont->topdict, "ROS", 3);
cff_dict_set(cffont->topdict, "ROS", 0,
- (double) cff_get_sid(cffont, (char *)"Adobe"));
+ (double) cff_get_sid(cffont, "Adobe"));
cff_dict_set(cffont->topdict, "ROS", 1,
- (double) cff_get_sid(cffont, (char *)"Identity"));
+ (double) cff_get_sid(cffont, "Identity"));
cff_dict_set(cffont->topdict, "ROS", 2, 0.0);
destlen = write_fontfile(font, cffont);
@@ -2009,9 +2009,9 @@ CIDFont_type0_t1dofont (CIDFont *font)
/* CFF code need to be rewrote... */
cff_dict_add(cffont->topdict, "ROS", 3);
cff_dict_set(cffont->topdict, "ROS", 0,
- (double) cff_get_sid(cffont, (char *)"Adobe"));
+ (double) cff_get_sid(cffont, "Adobe"));
cff_dict_set(cffont->topdict, "ROS", 1,
- (double) cff_get_sid(cffont, (char *)"Identity"));
+ (double) cff_get_sid(cffont, "Identity"));
cff_dict_set(cffont->topdict, "ROS", 2, 0.0);
cffont->num_glyphs = num_glyphs;
diff --git a/Build/source/texk/dvipdfmx/src/cidtype2.c b/Build/source/texk/dvipdfmx/src/cidtype2.c
index f5560682e13..420f46f66ff 100644
--- a/Build/source/texk/dvipdfmx/src/cidtype2.c
+++ b/Build/source/texk/dvipdfmx/src/cidtype2.c
@@ -184,7 +184,7 @@ find_tocode_cmap (const char *reg, const char *ord, int select)
{
int cmap_id = -1, i;
char *cmap_name;
- char *append;
+ const char *append;
if (!reg || !ord ||
select < 0 || select > KNOWN_ENCODINGS_MAX)
@@ -195,7 +195,7 @@ find_tocode_cmap (const char *reg, const char *ord, int select)
return NULL;
for (i = 0; cmap_id < 0 && i < 5; i++) {
- append = (char *) known_encodings[select].pdfnames[i];
+ append = known_encodings[select].pdfnames[i];
if (!append)
break;
cmap_name = NEW(strlen(reg) + strlen(ord) + strlen(append) + 3, char);
@@ -207,7 +207,7 @@ find_tocode_cmap (const char *reg, const char *ord, int select)
WARN("Could not find CID-to-Code mapping for \"%s-%s\".", reg, ord);
WARN("I tried to load (one of) the following file(s):");
for (i = 0; i < 5; i++) {
- append = (char *) known_encodings[select].pdfnames[i];
+ append = known_encodings[select].pdfnames[i];
if (!append)
break;
MESG(" %s-%s-%s", reg, ord, append);
diff --git a/Build/source/texk/dvipdfmx/src/cmap.c b/Build/source/texk/dvipdfmx/src/cmap.c
index 2df1917707f..4dbe4b7537f 100644
--- a/Build/source/texk/dvipdfmx/src/cmap.c
+++ b/Build/source/texk/dvipdfmx/src/cmap.c
@@ -254,10 +254,11 @@ CMap_decode_char (CMap *cmap,
unsigned char **outbuf, long *outbytesleft)
{
mapDef *t;
- unsigned char *p, c = 0, *save;
+ const unsigned char *p, *save;
+ unsigned char c = 0;
long count = 0;
- p = save = (unsigned char *) *inbuf;
+ p = save = *inbuf;
/*
* First handle some special cases:
*/
diff --git a/Build/source/texk/dvipdfmx/src/cmap_write.c b/Build/source/texk/dvipdfmx/src/cmap_write.c
index b7e8ea75dba..5b25ff7158f 100644
--- a/Build/source/texk/dvipdfmx/src/cmap_write.c
+++ b/Build/source/texk/dvipdfmx/src/cmap_write.c
@@ -344,7 +344,7 @@ CMap_create_stream (CMap *cmap, int flags) /* flags unused */
2 * (cmap->profile.maxBytesIn + cmap->profile.maxBytesOut) + 16;
/* Start CMap */
- pdf_add_stream(stream, (void *) CMAP_BEGIN, strlen(CMAP_BEGIN));
+ pdf_add_stream(stream, (const void *) CMAP_BEGIN, strlen(CMAP_BEGIN));
wbuf.curptr += sprintf(wbuf.curptr, "/CMapName /%s def\n", cmap->name);
wbuf.curptr += sprintf(wbuf.curptr, "/CMapType %d def\n" , cmap->type);
diff --git a/Build/source/texk/dvipdfmx/src/dpxcrypt.c b/Build/source/texk/dvipdfmx/src/dpxcrypt.c
index 36174f28e6f..e2666c1d4d3 100644
--- a/Build/source/texk/dvipdfmx/src/dpxcrypt.c
+++ b/Build/source/texk/dvipdfmx/src/dpxcrypt.c
@@ -87,7 +87,7 @@ void MD5_init (MD5_CONTEXT *ctx)
#define FI(b, c, d) (c ^ (b | ~d))
/* transform n*64 bytes */
-static void transform (MD5_CONTEXT *ctx, unsigned char *data)
+static void transform (MD5_CONTEXT *ctx, const unsigned char *data)
{
unsigned long correct_words[16];
register unsigned long A = ctx->A;
@@ -97,7 +97,7 @@ static void transform (MD5_CONTEXT *ctx, unsigned char *data)
unsigned long *cwp = correct_words;
#ifdef WORDS_BIGENDIAN
- { int i; unsigned char *p1, *p2;
+ { int i; const unsigned char *p1; unsigned char *p2;
for (i = 0, p1 = data, p2 = (unsigned char *)correct_words; i < 16; i++, p2 += 4 ) {
p2[3] = *p1++; p2[2] = *p1++; p2[1] = *p1++; p2[0] = *p1++;
}
@@ -201,7 +201,7 @@ static void transform (MD5_CONTEXT *ctx, unsigned char *data)
/* The routine updates the message-digest context to
* account for the presence of each of the characters inBuf[0..inLen-1]
* in the message whose digest is being computed. */
-void MD5_write (MD5_CONTEXT *hd, unsigned char *inbuf, unsigned long inlen)
+void MD5_write (MD5_CONTEXT *hd, const unsigned char *inbuf, unsigned long inlen)
{
if (hd->count == 64) { /* flush the buffer */
transform(hd, hd->buf);
diff --git a/Build/source/texk/dvipdfmx/src/dpxcrypt.h b/Build/source/texk/dvipdfmx/src/dpxcrypt.h
index 98155a6e3e1..77ca47888d4 100644
--- a/Build/source/texk/dvipdfmx/src/dpxcrypt.h
+++ b/Build/source/texk/dvipdfmx/src/dpxcrypt.h
@@ -34,7 +34,7 @@ typedef struct {
} MD5_CONTEXT;
void MD5_init (MD5_CONTEXT *ctx);
-void MD5_write (MD5_CONTEXT *ctx, unsigned char *inbuf, unsigned long inlen);
+void MD5_write (MD5_CONTEXT *ctx, const unsigned char *inbuf, unsigned long inlen);
void MD5_final (unsigned char *outbuf, MD5_CONTEXT *ctx);
/* libgcrypt arcfour */
diff --git a/Build/source/texk/dvipdfmx/src/dpxfile.c b/Build/source/texk/dvipdfmx/src/dpxfile.c
index 3965b552ce6..5e5439fc4ef 100644
--- a/Build/source/texk/dvipdfmx/src/dpxfile.c
+++ b/Build/source/texk/dvipdfmx/src/dpxfile.c
@@ -187,8 +187,7 @@ dpx_foolsearch (const char *foolname,
return fqpn;
}
-#else /* TEXK */
-#if defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
+#else /* !MIKTEX */
# define TDS11DOC "http://www.tug.org/ftp/tex/tds-1.1/tds.html#Fonts"
static void
insistupdate (const char *filename,
@@ -214,7 +213,6 @@ insistupdate (const char *filename,
WARN(">> %s", fir->default_path);
WARN(">> Please read \"README\" file.");
}
-#endif /* TDS 1.1 */
static char *
dpx_find__app__xyz (const char *filename,
@@ -356,11 +354,9 @@ dpx_find_fontmap_file (const char *filename)
fqpn = kpse_find_file(q, kpse_fontmap_format, 0);
if (!fqpn) {
fqpn = dpx_find__app__xyz(q, ".map", 1);
-#if defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
if (fqpn)
insistupdate(q, fqpn, PACKAGE,
kpse_program_text_format, kpse_fontmap_format);
-#endif
}
#endif /* MIKETEX */
RELEASE(q);
@@ -382,11 +378,9 @@ dpx_find_agl_file (const char *filename)
fqpn = kpse_find_file(q, kpse_fontmap_format, 0);
if (!fqpn) {
fqpn = dpx_find__app__xyz(q, ".txt", 1);
-#if defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
if (fqpn)
insistupdate(q, fqpn, PACKAGE,
kpse_program_text_format, kpse_fontmap_format);
-#endif
}
#endif /* MIKETEX */
RELEASE(q);
@@ -433,9 +427,7 @@ dpx_find_cmap_file (const char *filename)
memset(_tmpbuf, 0, _MAX_PATH+1);
}
#else
-#if defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
fqpn = kpse_find_file(filename, kpse_cmap_format, 0);
-#endif
#endif
/* Files found above are assumed to be CMap,
@@ -445,11 +437,9 @@ dpx_find_cmap_file (const char *filename)
fqpn = dpx_foolsearch(fools[i], filename, 1);
if (fqpn) {
#ifndef MIKTEX
-#if defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
insistupdate(filename, fqpn, fools[i],
kpse_program_text_format, kpse_cmap_format);
#endif
-#endif
if (!qcheck_filetype(fqpn, DPX_RES_TYPE_CMAP)) {
WARN("Found file \"%s\" for PostScript CMap but it doesn't look like a CMap...", fqpn);
RELEASE(fqpn);
@@ -480,20 +470,16 @@ dpx_find_sfd_file (const char *filename)
q = ensuresuffix(filename, ".sfd");
#ifndef MIKTEX
-#if defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
fqpn = kpse_find_file(q, kpse_sfd_format, 0);
-#endif
#endif /* !MIKTEX */
for (i = 0; !fqpn && fools[i]; i++) {
fqpn = dpx_foolsearch(fools[i], q, 1);
#ifndef MIKTEX
-#if defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
if (fqpn)
insistupdate(filename, fqpn, fools[i],
kpse_program_text_format, kpse_sfd_format);
#endif
-#endif
}
RELEASE(q);
@@ -518,22 +504,16 @@ dpx_find_enc_file (const char *filename)
strcpy(fqpn, _tmpbuf);
}
#else
-# if defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
fqpn = kpse_find_file(q, kpse_enc_format, 0);
-# else
- fqpn = kpse_find_file(q, kpse_tex_ps_header_format, 0);
-# endif
#endif /* MIKTEX */
for (i = 0; !fqpn && fools[i]; i++) {
fqpn = dpx_foolsearch(fools[i], q, 1);
#ifndef MIKTEX
-#if defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
if (fqpn)
insistupdate(filename, fqpn, fools[i],
kpse_program_text_format, kpse_enc_format);
#endif
-#endif
}
RELEASE(q);
@@ -579,20 +559,16 @@ dpx_find_opentype_file (const char *filename)
q = ensuresuffix(filename, ".otf");
#ifndef MIKTEX
-#if defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
fqpn = kpse_find_file(q, kpse_opentype_format, 0);
if (!fqpn) {
#endif
-#endif
fqpn = dpx_foolsearch(PACKAGE, q, 0);
#ifndef MIKTEX
-#if defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
if (fqpn)
insistupdate(filename, fqpn, PACKAGE,
kpse_program_binary_format, kpse_opentype_format);
}
#endif
-#endif
RELEASE(q);
/* *We* use "opentype" for ".otf" (CFF). */
@@ -649,14 +625,14 @@ dpx_create_temp_file (void)
# define __TMPDIR "/tmp"
# define TEMPLATE "/dvipdfmx.XXXXXXX"
{
- char *_tmpd;
+ const char *_tmpd;
int _fd = -1;
# ifdef HAVE_GETENV
_tmpd = getenv("TMPDIR");
if (!_tmpd)
- _tmpd = (char *) __TMPDIR;
+ _tmpd = __TMPDIR;
# else
- _tmpd = (char *) __TMPDIR;
+ _tmpd = __TMPDIR;
# endif /* HAVE_GETENV */
tmp = NEW(strlen(_tmpd) + strlen(TEMPLATE) + 1, char);
strcpy(tmp, _tmpd);
@@ -710,7 +686,7 @@ dpx_file_apply_filter (const char *cmdtmpl,
unsigned char version)
{
char *cmd = NULL;
- char *p, *q;
+ const char *p, *q;
size_t n, size;
int error = 0;
@@ -722,7 +698,7 @@ dpx_file_apply_filter (const char *cmdtmpl,
size = strlen(cmdtmpl) + strlen(input) + strlen(output) + 3;
cmd = NEW(size, char);
memset(cmd, 0, size);
- for (n = 0, p = (char *) cmdtmpl; *p != 0; p++) {
+ for (n = 0, p = cmdtmpl; *p != 0; p++) {
#define need(s,l,m,n) \
if ((l) + (n) >= (m)) { \
(m) += (n) + 128; \
diff --git a/Build/source/texk/dvipdfmx/src/dpxutil.c b/Build/source/texk/dvipdfmx/src/dpxutil.c
index 0de3631f73f..af5dc458a65 100644
--- a/Build/source/texk/dvipdfmx/src/dpxutil.c
+++ b/Build/source/texk/dvipdfmx/src/dpxutil.c
@@ -217,7 +217,7 @@ get_hash (const void *key, int keylen)
int i;
for (i = 0; i < keylen; i++) {
- hkey = (hkey << 5) + hkey + ((char *)key)[i];
+ hkey = (hkey << 5) + hkey + ((const char *)key)[i];
}
return (hkey % HASH_TABLE_SIZE);
@@ -436,10 +436,10 @@ ht_iter_next (struct ht_iter *iter)
static int
-read_c_escchar (char *r, char **pp, char *endptr)
+read_c_escchar (char *r, const char **pp, const char *endptr)
{
int c = 0, l = 1;
- char *p = *pp;
+ const char *p = *pp;
switch (p[0]) {
case 'a' : c = '\a'; p++; break;
@@ -498,9 +498,9 @@ read_c_escchar (char *r, char **pp, char *endptr)
#define C_QUOTE '"'
#define C_ESCAPE '\\'
static int
-read_c_litstrc (char *q, int len, char **pp, char *endptr)
+read_c_litstrc (char *q, int len, const char **pp, const char *endptr)
{
- char *p;
+ const char *p;
int l = 0;
#define Q_TERM 0
#define Q_CONT -1
@@ -551,10 +551,10 @@ read_c_litstrc (char *q, int len, char **pp, char *endptr)
}
char *
-parse_c_string (char **pp, char *endptr)
+parse_c_string (const char **pp, const char *endptr)
{
char *q = NULL;
- char *p = *pp;
+ const char *p = *pp;
int l = 0;
if (p >= endptr || p[0] != C_QUOTE)
@@ -583,10 +583,10 @@ parse_c_string (char **pp, char *endptr)
)
char *
-parse_c_ident (char **pp, char *endptr)
+parse_c_ident (const char **pp, const char *endptr)
{
char *q = NULL;
- char *p = *pp;
+ const char *p = *pp;
int n;
if (p >= endptr || !ISCNONDIGITS(*p))
@@ -601,10 +601,10 @@ parse_c_ident (char **pp, char *endptr)
}
char *
-parse_float_decimal (char **pp, char *endptr)
+parse_float_decimal (const char **pp, const char *endptr)
{
char *q = NULL;
- char *p = *pp;
+ const char *p = *pp;
int s = 0, n = 0;
if (p >= endptr)
diff --git a/Build/source/texk/dvipdfmx/src/dpxutil.h b/Build/source/texk/dvipdfmx/src/dpxutil.h
index 5d230c655af..a082d12d49d 100644
--- a/Build/source/texk/dvipdfmx/src/dpxutil.h
+++ b/Build/source/texk/dvipdfmx/src/dpxutil.h
@@ -95,8 +95,8 @@ extern char *ht_iter_getkey (struct ht_iter *iter, int *keylen);
extern void *ht_iter_getval (struct ht_iter *iter);
extern int ht_iter_next (struct ht_iter *iter);
-extern char *parse_float_decimal (char **pp, char *endptr);
-extern char *parse_c_string (char **pp, char *endptr);
-extern char *parse_c_ident (char **pp, char *endptr);
+extern char *parse_float_decimal (const char **pp, const char *endptr);
+extern char *parse_c_string (const char **pp, const char *endptr);
+extern char *parse_c_ident (const char **pp, const char *endptr);
#endif /* _DPXUTIL_H_ */
diff --git a/Build/source/texk/dvipdfmx/src/dvi.c b/Build/source/texk/dvipdfmx/src/dvi.c
index 2c98895796b..e7cc0fa1258 100644
--- a/Build/source/texk/dvipdfmx/src/dvi.c
+++ b/Build/source/texk/dvipdfmx/src/dvi.c
@@ -459,7 +459,7 @@ void
dvi_do_special (const void *buffer, UNSIGNED_QUAD size)
{
double x_user, y_user, mag;
- char *p;
+ const char *p;
if (size > 0x7fffffffUL) {
WARN("Special more than %ul bytes???", size);
@@ -468,7 +468,7 @@ dvi_do_special (const void *buffer, UNSIGNED_QUAD size)
graphics_mode();
- p = (char *) buffer;
+ p = (const char *) buffer;
x_user = dvi_state.h * dvi2pts;
y_user = -dvi_state.v * dvi2pts;
@@ -1634,9 +1634,10 @@ dvi_vf_finish (void)
* length value must be divided by current magnification.
*/
static int
-read_length (double *vp, double mag, char **pp, char *endptr)
+read_length (double *vp, double mag, const char **pp, const char *endptr)
{
- char *q, *p = *pp;
+ char *q;
+ const char *p = *pp;
double v, u = 1.0;
const char *_ukeys[] = {
#define K_UNIT__PT 0
@@ -1689,8 +1690,8 @@ read_length (double *vp, double mag, char **pp, char *endptr)
static int
scan_special (double *wd, double *ht, double *xo, double *yo, char *lm, const char *buf, UNSIGNED_QUAD size)
{
- char *q, *p = (char *) buf;
- char *endptr;
+ char *q;
+ const char *p = buf, *endptr;
int ns_pdf = 0, error = 0;
endptr = p + size;
diff --git a/Build/source/texk/dvipdfmx/src/dvipdfmx.c b/Build/source/texk/dvipdfmx/src/dvipdfmx.c
index 44685bb20a0..113f109d783 100644
--- a/Build/source/texk/dvipdfmx/src/dvipdfmx.c
+++ b/Build/source/texk/dvipdfmx/src/dvipdfmx.c
@@ -183,9 +183,10 @@ usage (void)
static int
-read_length (double *vp, char **pp, char *endptr)
+read_length (double *vp, const char **pp, const char *endptr)
{
- char *q, *p = *pp;
+ char *q;
+ const char *p = *pp;
double v, u = 1.0;
const char *_ukeys[] = {
#define K_UNIT__PT 0
@@ -243,7 +244,7 @@ select_paper (const char *paperspec)
paper_width = paperpswidth (pi);
paper_height = paperpsheight(pi);
} else {
- char *p = (char *) paperspec, *endptr, *comma;
+ const char *p = paperspec, *endptr, *comma;
comma = strchr(p, ',');
endptr = p + strlen(p);
if (!comma)
@@ -267,7 +268,8 @@ int max_page_ranges = 0;
static void
select_pages (const char *pagespec)
{
- char *q, *p = (char *) pagespec;
+ char *q;
+ const char *p = pagespec;
while (*p != '\0') {
/* Enlarge page range table if necessary */
@@ -387,19 +389,19 @@ do_args (int argc, char *argv[])
case 'g':
CHECK_ARG(1, "annotation \"grow\" amount");
nextptr = argv[1];
- read_length(&annot_grow, &nextptr, nextptr + strlen(nextptr));
+ read_length(&annot_grow, (const char **) &nextptr, nextptr + strlen(nextptr));
POP_ARG();
break;
case 'x':
CHECK_ARG(1, "horizontal offset value");
nextptr = argv[1];
- read_length(&x_offset, &nextptr, nextptr + strlen(nextptr));
+ read_length(&x_offset, (const char **) &nextptr, nextptr + strlen(nextptr));
POP_ARG();
break;
case 'y':
CHECK_ARG(1, "vertical offset value");
nextptr = argv[1];
- read_length(&y_offset, &nextptr, nextptr + strlen(nextptr));
+ read_length(&y_offset, (const char **) &nextptr, nextptr + strlen(nextptr));
POP_ARG();
break;
case 'o':
@@ -584,7 +586,8 @@ cleanup (void)
static void
read_config_file (const char *config)
{
- char *start, *end, *option;
+ const char *start, *end;
+ char *option;
FILE *fp;
fp = DPXFOPEN(config, DPX_RES_TYPE_TEXT);
diff --git a/Build/source/texk/dvipdfmx/src/fontmap.c b/Build/source/texk/dvipdfmx/src/fontmap.c
index 7215ea6dea5..76cfc8ad57d 100644
--- a/Build/source/texk/dvipdfmx/src/fontmap.c
+++ b/Build/source/texk/dvipdfmx/src/fontmap.c
@@ -222,9 +222,9 @@ readline (char *buf, int buf_len, FILE *fp)
# define ISBLANK(c) ((c) == ' ' || (c) == '\t')
#endif
static void
-skip_blank (char **pp, char *endptr)
+skip_blank (const char **pp, const char *endptr)
{
- char *p = *pp;
+ const char *p = *pp;
if (!p || p >= endptr)
return;
for ( ; p < endptr && ISBLANK(*p); p++);
@@ -232,9 +232,10 @@ skip_blank (char **pp, char *endptr)
}
static char *
-parse_string_value (char **pp, char *endptr)
+parse_string_value (const char **pp, const char *endptr)
{
- char *q = NULL, *p = *pp;
+ char *q = NULL;
+ const char *p = *pp;
int n;
if (!p || p >= endptr)
@@ -255,9 +256,10 @@ parse_string_value (char **pp, char *endptr)
/* no preceeding spaces allowed */
static char *
-parse_integer_value (char **pp, char *endptr, int base)
+parse_integer_value (const char **pp, const char *endptr, int base)
{
- char *q, *p = *pp;
+ char *q;
+ const char *p = *pp;
int has_sign = 0, has_prefix = 0, n;
ASSERT( base == 0 || (base >= 2 && base <= 36) );
@@ -308,9 +310,9 @@ parse_integer_value (char **pp, char *endptr, int base)
static int
fontmap_parse_mapdef_dpm (fontmap_rec *mrec,
- const char *mapdef, char *endptr)
+ const char *mapdef, const char *endptr)
{
- char *p = (char *) mapdef;
+ const char *p = mapdef;
/*
* Parse record line in map file. First two fields (after TeX font
@@ -485,7 +487,7 @@ fontmap_parse_mapdef_dpm (fontmap_rec *mrec,
RELEASE(q);
return -1;
}
- *r = 0; r++; skip_blank(&r, r + strlen(r));
+ *r = 0; r++; skip_blank((const char **)&r, r + strlen(r));
if (*r == '\0') {
WARN("Invalid value for option 'm': %s,", q);
RELEASE(q);
@@ -556,9 +558,10 @@ fontmap_parse_mapdef_dpm (fontmap_rec *mrec,
/* Parse record line in map file of DVIPS/pdfTeX format. */
static int
fontmap_parse_mapdef_dps (fontmap_rec *mrec,
- const char *mapdef, char *endptr)
+ const char *mapdef, const char *endptr)
{
- char *p = (char *)mapdef, *q;
+ const char *p = mapdef;
+ char *q;
skip_blank(&p, endptr);
@@ -592,7 +595,8 @@ fontmap_parse_mapdef_dps (fontmap_rec *mrec,
case '"': /* Options */
if ((q = parse_string_value(&p, endptr))) {
- char *r = q, *e = q+strlen(q), *s, *t;
+ const char *r = q, *e = q+strlen(q);
+ char *s, *t;
skip_blank(&r, e);
while (r < e) {
if ((s = parse_float_decimal(&r, e))) {
@@ -644,7 +648,7 @@ chop_sfd_name (const char *tex_name, char **sfd_name)
*sfd_name = NULL;
- p = strchr((char *) tex_name, '@');
+ p = strchr(tex_name, '@');
if (!p ||
p[1] == '\0' || p == tex_name) {
return NULL;
@@ -869,11 +873,12 @@ int
pdf_read_fontmap_line (fontmap_rec *mrec, const char *mline, long mline_len, int format)
{
int error;
- char *q, *p, *endptr;
+ char *q;
+ const char *p, *endptr;
ASSERT(mrec);
- p = (char *) mline;
+ p = mline;
endptr = p + mline_len;
skip_blank(&p, endptr);
@@ -924,12 +929,12 @@ int
is_pdfm_mapline (const char *mline) /* NULL terminated. */
{
int n = 0;
- char *p, *endptr;
+ const char *p, *endptr;
if (strchr(mline, '"') || strchr(mline, '<'))
return -1; /* DVIPS/pdfTeX format */
- p = (char *) mline;
+ p = mline;
endptr = p + strlen(mline);
skip_blank(&p, endptr);
@@ -951,7 +956,7 @@ pdf_load_fontmap_file (const char *filename, int mode)
{
fontmap_rec *mrec;
FILE *fp;
- char *p = NULL, *endptr;
+ const char *p = NULL, *endptr;
long llen, lpos = 0;
int error = 0, format = 0;
@@ -1128,9 +1133,10 @@ pdf_clear_fontmaps (void)
*/
static char *
-substr (char **str, char stop)
+substr (const char **str, char stop)
{
- char *sstr, *endptr;
+ char *sstr;
+ const char *endptr;
endptr = strchr(*str, stop);
if (!endptr || endptr == *str)
@@ -1150,12 +1156,13 @@ static char *
strip_options (const char *map_name, fontmap_opt *opt)
{
char *font_name;
- char *p, *next = NULL;
+ const char *p;
+ char *next = NULL;
int have_csi = 0, have_style = 0;
ASSERT(opt);
- p = (char *) map_name;
+ p = map_name;
font_name = NULL;
opt->charcoll = NULL;
opt->index = 0;
diff --git a/Build/source/texk/dvipdfmx/src/mfileio.c b/Build/source/texk/dvipdfmx/src/mfileio.c
index 425ab1fe474..b1ed18706a9 100644
--- a/Build/source/texk/dvipdfmx/src/mfileio.c
+++ b/Build/source/texk/dvipdfmx/src/mfileio.c
@@ -64,7 +64,7 @@ int mfclose(FILE *file, const char *function, int line)
}
#endif
-static void os_error()
+static void os_error(void)
{
ERROR ("io: An OS command failed that should not have.\n");
}
diff --git a/Build/source/texk/dvipdfmx/src/mpost.c b/Build/source/texk/dvipdfmx/src/mpost.c
index 5f5dc74d260..7ec8c532c4b 100644
--- a/Build/source/texk/dvipdfmx/src/mpost.c
+++ b/Build/source/texk/dvipdfmx/src/mpost.c
@@ -70,7 +70,7 @@
* immediately and forget about it but remember current path.
*/
-static int mp_parse_body (char **start, char *end, double x_user, double y_user);
+static int mp_parse_body (const char **start, const char *end, double x_user, double y_user);
static struct mp_font
{
@@ -207,7 +207,7 @@ is_fontname (const char *token)
}
int
-mps_scan_bbox (char **pp, char *endptr, pdf_rect *bbox)
+mps_scan_bbox (const char **pp, const char *endptr, pdf_rect *bbox)
{
char *number;
double values[4];
@@ -253,10 +253,10 @@ mps_scan_bbox (char **pp, char *endptr, pdf_rect *bbox)
}
static void
-skip_prolog (char **start, char *end)
+skip_prolog (const char **start, const char *end)
{
int found_prolog = 0;
- char *save;
+ const char *save;
save = *start;
while (*start < end) {
@@ -833,9 +833,9 @@ static int
do_mpost_bind_def (const char *ps_code, double x_user, double y_user)
{
int error = 0;
- char *start, *end;
+ const char *start, *end;
- start = (char *) ps_code;
+ start = ps_code;
end = start + strlen(start);
error = mp_parse_body(&start, end, x_user, y_user);
@@ -1397,7 +1397,7 @@ do_operator (const char *token, double x_user, double y_user)
* dealing with texfig.
*/
static int
-mp_parse_body (char **start, char *end, double x_user, double y_user)
+mp_parse_body (const char **start, const char *end, double x_user, double y_user)
{
char *token;
pdf_obj *obj;
@@ -1467,7 +1467,7 @@ mps_stack_depth (void)
}
int
-mps_exec_inline (char **p, char *endptr,
+mps_exec_inline (const char **p, const char *endptr,
double x_user, double y_user)
{
int error;
@@ -1518,7 +1518,8 @@ mps_include_page (const char *ident, FILE *fp)
int form_id;
xform_info info;
int st_depth, gs_depth;
- char *buffer, *p, *endptr;
+ char *buffer;
+ const char *p, *endptr;
long length, nb_read;
int dirmode, autorotate, error;
@@ -1531,9 +1532,9 @@ mps_include_page (const char *ident, FILE *fp)
}
buffer = NEW(length + 1, char);
+ buffer[length] = '\0';
p = buffer;
endptr = p + length;
- endptr[0] = '\0';
while (length > 0) {
nb_read = fread(buffer, sizeof(char), length, fp);
@@ -1595,7 +1596,8 @@ mps_do_page (FILE *image_file)
{
int error = 0;
pdf_rect bbox;
- char *buffer, *start, *end;
+ char *buffer;
+ const char *start, *end;
long size;
int dir_mode;
diff --git a/Build/source/texk/dvipdfmx/src/mpost.h b/Build/source/texk/dvipdfmx/src/mpost.h
index 7020b3775da..1471bbcdaad 100644
--- a/Build/source/texk/dvipdfmx/src/mpost.h
+++ b/Build/source/texk/dvipdfmx/src/mpost.h
@@ -31,12 +31,12 @@
extern int check_for_mp (FILE *fp);
-extern int mps_scan_bbox (char **pp, char *endptr, pdf_rect *bbox);
+extern int mps_scan_bbox (const char **pp, const char *endptr, pdf_rect *bbox);
/* returns xobj_id */
extern int mps_include_page (const char *ident, FILE *fp);
-extern int mps_exec_inline (char **buffer, char *endptr,
+extern int mps_exec_inline (const char **buffer, const char *endptr,
double x_user, double y_user);
extern int mps_stack_depth (void);
diff --git a/Build/source/texk/dvipdfmx/src/otl_conf.c b/Build/source/texk/dvipdfmx/src/otl_conf.c
index affba8b672d..107f8cb597e 100644
--- a/Build/source/texk/dvipdfmx/src/otl_conf.c
+++ b/Build/source/texk/dvipdfmx/src/otl_conf.c
@@ -46,7 +46,7 @@ otl_conf_set_verbose (void)
}
static pdf_obj *
-parse_uc_coverage (pdf_obj *gclass, char **pp, char *endptr)
+parse_uc_coverage (pdf_obj *gclass, const char **pp, const char *endptr)
{
pdf_obj *coverage;
pdf_obj *value;
@@ -126,7 +126,7 @@ parse_uc_coverage (pdf_obj *gclass, char **pp, char *endptr)
return coverage;
}
-static pdf_obj *parse_block (pdf_obj *gclass, char **pp, char *endptr);
+static pdf_obj *parse_block (pdf_obj *gclass, const char **pp, const char *endptr);
static void
add_rule (pdf_obj *rule, pdf_obj *gclass,
@@ -234,7 +234,7 @@ add_rule (pdf_obj *rule, pdf_obj *gclass,
}
static pdf_obj *
-parse_substrule (pdf_obj *gclass, char **pp, char *endptr)
+parse_substrule (pdf_obj *gclass, const char **pp, const char *endptr)
{
pdf_obj *substrule;
char *token;
@@ -319,7 +319,7 @@ parse_substrule (pdf_obj *gclass, char **pp, char *endptr)
}
static pdf_obj *
-parse_block (pdf_obj *gclass, char **pp, char *endptr)
+parse_block (pdf_obj *gclass, const char **pp, const char *endptr)
{
pdf_obj *rule;
char *token, *tmp;
@@ -495,7 +495,7 @@ otl_read_conf (const char *conf_name)
p = wbuf;
gclass = pdf_new_dict();
- rule = parse_block(gclass, &p, endptr);
+ rule = parse_block(gclass, (const char **) &p, endptr);
pdf_release_obj(gclass);
RELEASE(wbuf);
diff --git a/Build/source/texk/dvipdfmx/src/otl_opt.c b/Build/source/texk/dvipdfmx/src/otl_opt.c
index 3ccab257ea0..9b97f4008b4 100644
--- a/Build/source/texk/dvipdfmx/src/otl_opt.c
+++ b/Build/source/texk/dvipdfmx/src/otl_opt.c
@@ -111,7 +111,7 @@ bt_release_tree (struct bt_node *tree)
}
static struct bt_node *
-parse_expr (char **pp, char *endptr)
+parse_expr (const char **pp, const char *endptr)
{
struct bt_node *root, *curr;
@@ -318,12 +318,12 @@ check_uc_coverage (struct uc_coverage *coverage)
int
otl_parse_optstring (otl_opt *opt, const char *optstr)
{
- char *p, *endptr;
+ const char *p, *endptr;
ASSERT(opt);
if (optstr) {
- p = (char *) optstr;
+ p = optstr;
endptr = p + strlen(optstr);
opt->rule = parse_expr(&p, endptr);
}
diff --git a/Build/source/texk/dvipdfmx/src/pdfcolor.c b/Build/source/texk/dvipdfmx/src/pdfcolor.c
index e44ca6176f3..8dad2157bba 100644
--- a/Build/source/texk/dvipdfmx/src/pdfcolor.c
+++ b/Build/source/texk/dvipdfmx/src/pdfcolor.c
@@ -517,9 +517,9 @@ typedef unsigned long iccSig;
static iccSig
str2iccSig (const void *s)
{
- char *p;
+ const char *p;
- p = (char *) s;
+ p = (const char *) s;
return (iccSig) ((p[0]<<24)|(p[1]<<16)|(p[2]<<8)|p[3]);
}
@@ -683,12 +683,12 @@ int
iccp_check_colorspace (int colortype, const void *profile, long proflen)
{
iccSig colorspace;
- unsigned char *p;
+ const unsigned char *p;
if (!profile || proflen < 128)
return -1;
- p = (unsigned char *) profile;
+ p = (const unsigned char *) profile;
colorspace = str2iccSig(p + 16);
@@ -722,13 +722,13 @@ pdf_obj *
iccp_get_rendering_intent (const void *profile, long proflen)
{
pdf_obj *ri = NULL;
- unsigned char *p;
+ const unsigned char *p;
long intent;
if (!profile || proflen < 128)
return NULL;
- p = (unsigned char *) profile;
+ p = (const unsigned char *) profile;
intent = (p[64] << 24)|(p[65] << 16)|(p[66] << 8)|p[67];
switch (ICC_INTENT_TYPE(intent)) {
@@ -760,7 +760,7 @@ static int
iccp_unpack_header (iccHeader *icch,
const void *profile, long proflen, int check_size)
{
- unsigned char *p, *endptr;
+ const unsigned char *p, *endptr;
if (check_size) {
if (!profile || proflen < 128 ||
@@ -770,7 +770,7 @@ iccp_unpack_header (iccHeader *icch,
}
}
- p = (unsigned char *) profile;
+ p = (const unsigned char *) profile;
endptr = p + 128;
icch->size = sget_signed_long(p);
@@ -853,10 +853,10 @@ iccp_unpack_header (iccHeader *icch,
static void
iccp_get_checksum (unsigned char *checksum, const void *profile, long proflen)
{
- unsigned char *p;
+ const unsigned char *p;
MD5_CONTEXT md5;
- p = (unsigned char *) profile;
+ p = (const unsigned char *) profile;
MD5_init (&md5);
MD5_write(&md5, p + ICC_HEAD_SECT1_START, ICC_HEAD_SECT1_LENGTH);
diff --git a/Build/source/texk/dvipdfmx/src/pdfdev.c b/Build/source/texk/dvipdfmx/src/pdfdev.c
index c539add58f7..67b75629863 100644
--- a/Build/source/texk/dvipdfmx/src/pdfdev.c
+++ b/Build/source/texk/dvipdfmx/src/pdfdev.c
@@ -890,9 +890,9 @@ static unsigned char sbuf1[FORMAT_BUF_SIZE];
static int
handle_multibyte_string (struct dev_font *font,
- unsigned char **str_ptr, int *str_len, int ctype)
+ const unsigned char **str_ptr, int *str_len, int ctype)
{
- unsigned char *p;
+ const unsigned char *p;
int i, length;
p = *str_ptr;
@@ -948,7 +948,8 @@ handle_multibyte_string (struct dev_font *font,
* TODO: A character decomposed to multiple characters.
*/
if (font->enc_id >= 0) {
- unsigned char *inbuf, *outbuf;
+ const unsigned char *inbuf;
+ unsigned char *outbuf;
long inbytesleft, outbytesleft;
CMap *cmap;
@@ -959,7 +960,7 @@ handle_multibyte_string (struct dev_font *font,
outbytesleft = FORMAT_BUF_SIZE;
CMap_decode(cmap,
- (const unsigned char **) &inbuf, &inbytesleft, &outbuf, &outbytesleft);
+ &inbuf, &inbytesleft, &outbuf, &outbytesleft);
if (inbytesleft != 0) {
WARN("CMap conversion failed. (%d bytes remains)", inbytesleft);
return -1;
@@ -1021,7 +1022,7 @@ pdf_dev_set_string (spt_t xpos, spt_t ypos,
int font_id, int ctype)
{
struct dev_font *font;
- unsigned char *str_ptr; /* Pointer to the reencoded string. */
+ const unsigned char *str_ptr; /* Pointer to the reencoded string. */
int length, i, len = 0;
spt_t kern, delh, delv;
spt_t text_xorigin;
@@ -1044,7 +1045,7 @@ pdf_dev_set_string (spt_t xpos, spt_t ypos,
text_xorigin = text_state.ref_x;
text_yorigin = text_state.ref_y;
- str_ptr = (unsigned char *) instr_ptr;
+ str_ptr = instr_ptr;
length = instr_len;
if (font->format == PDF_FONTTYPE_COMPOSITE) {
diff --git a/Build/source/texk/dvipdfmx/src/pdfdoc.c b/Build/source/texk/dvipdfmx/src/pdfdoc.c
index 087ca41e1ee..2aa3af1150c 100644
--- a/Build/source/texk/dvipdfmx/src/pdfdoc.c
+++ b/Build/source/texk/dvipdfmx/src/pdfdoc.c
@@ -193,7 +193,7 @@ typedef struct pdf_article
struct name_dict
{
- char *category;
+ const char *category;
struct ht_table *data;
};
@@ -1417,7 +1417,7 @@ pdf_doc_init_names (pdf_doc *p, int check_gotos)
p->names = NEW(NUM_NAME_CATEGORY + 1, struct name_dict);
for (i = 0; i < NUM_NAME_CATEGORY; i++) {
- p->names[i].category = (char *) name_dict_categories[i];
+ p->names[i].category = name_dict_categories[i];
p->names[i].data = strcmp(name_dict_categories[i], "Dests") ?
NULL : pdf_new_name_tree();
/*
@@ -1461,7 +1461,7 @@ static void
pdf_doc_add_goto (pdf_obj *annot_dict)
{
pdf_obj *subtype = NULL, *A = NULL, *S = NULL, *D = NULL, *D_new, *dict;
- char *dest, *key;
+ const char *dest, *key;
if (!pdoc.check_gotos)
return;
diff --git a/Build/source/texk/dvipdfmx/src/pdfencoding.c b/Build/source/texk/dvipdfmx/src/pdfencoding.c
index 108500adbb1..78f82e5df2a 100644
--- a/Build/source/texk/dvipdfmx/src/pdfencoding.c
+++ b/Build/source/texk/dvipdfmx/src/pdfencoding.c
@@ -93,7 +93,7 @@ typedef struct pdf_encoding
static int pdf_encoding_new_encoding (const char *enc_name,
const char *ident,
const char **encoding_vec,
- char *baseenc_name,
+ const char *baseenc_name,
int flags);
static void
@@ -286,7 +286,8 @@ load_encoding_file (const char *filename)
FILE *fp;
pdf_obj *enc_name = NULL;
pdf_obj *encoding_array = NULL;
- char *wbuf, *p, *endptr;
+ char *wbuf;
+ const char *p, *endptr;
char *enc_vec[256];
int code, fsize, enc_id;
@@ -307,12 +308,12 @@ load_encoding_file (const char *filename)
fsize = file_size(fp);
wbuf = NEW(fsize + 1, char);
+ wbuf[fsize] = '\0';
fread(wbuf, sizeof(char), fsize, fp);
DPXFCLOSE(fp);
p = wbuf;
endptr = wbuf + fsize;
- p[fsize] = '\0';
skip_white(&p, endptr);
@@ -405,7 +406,7 @@ pdf_init_encodings (void)
static int
pdf_encoding_new_encoding (const char *enc_name, const char *ident,
const char **encoding_vec,
- char *baseenc_name, int flags)
+ const char *baseenc_name, int flags)
{
int enc_id, code;
@@ -458,7 +459,7 @@ pdf_encoding_new_encoding (const char *enc_name, const char *ident,
/* Creates Encoding resource and ToUnicode CMap
* for all non-predefined encodings.
*/
-void pdf_encoding_complete ()
+void pdf_encoding_complete (void)
{
int enc_id;
@@ -507,7 +508,7 @@ pdf_close_encodings (void)
}
int
-pdf_encoding_findresource (char *enc_name)
+pdf_encoding_findresource (const char *enc_name)
{
int enc_id;
pdf_encoding *encoding;
diff --git a/Build/source/texk/dvipdfmx/src/pdfencoding.h b/Build/source/texk/dvipdfmx/src/pdfencoding.h
index fdfbe7b6923..d65b2e9781b 100644
--- a/Build/source/texk/dvipdfmx/src/pdfencoding.h
+++ b/Build/source/texk/dvipdfmx/src/pdfencoding.h
@@ -40,7 +40,7 @@ extern void pdf_encoding_complete (void);
/* enc_name here is .enc file name or the name of predefined
* encodings.
*/
-extern int pdf_encoding_findresource (char *enc_name);
+extern int pdf_encoding_findresource (const char *enc_name);
/* Returns the Encoding resource object.
*/
diff --git a/Build/source/texk/dvipdfmx/src/pdfencrypt.c b/Build/source/texk/dvipdfmx/src/pdfencrypt.c
index 42902371fcf..d3311530f19 100644
--- a/Build/source/texk/dvipdfmx/src/pdfencrypt.c
+++ b/Build/source/texk/dvipdfmx/src/pdfencrypt.c
@@ -324,7 +324,7 @@ static void compute_user_password (void)
break;
case 3:
MD5_init(&md5_ctx);
- MD5_write(&md5_ctx, (unsigned char *)padding_string, MAX_STR_LEN);
+ MD5_write(&md5_ctx, padding_string, MAX_STR_LEN);
MD5_write(&md5_ctx, id_string, MAX_KEY_LEN);
MD5_final(md5_buf, &md5_ctx);
diff --git a/Build/source/texk/dvipdfmx/src/pdfnames.c b/Build/source/texk/dvipdfmx/src/pdfnames.c
index a209e110397..905664cc948 100644
--- a/Build/source/texk/dvipdfmx/src/pdfnames.c
+++ b/Build/source/texk/dvipdfmx/src/pdfnames.c
@@ -251,11 +251,11 @@ struct named_object
static int CDECL
cmp_key (const void *d1, const void *d2)
{
- struct named_object *sd1, *sd2;
+ const struct named_object *sd1, *sd2;
int keylen, cmp;
- sd1 = (struct named_object *) d1;
- sd2 = (struct named_object *) d2;
+ sd1 = (const struct named_object *) d1;
+ sd2 = (const struct named_object *) d2;
if (!sd1->key)
cmp = -1;
diff --git a/Build/source/texk/dvipdfmx/src/pdfobj.c b/Build/source/texk/dvipdfmx/src/pdfobj.c
index 7633a5883a0..7f4915aceb4 100644
--- a/Build/source/texk/dvipdfmx/src/pdfobj.c
+++ b/Build/source/texk/dvipdfmx/src/pdfobj.c
@@ -554,7 +554,7 @@ void pdf_out (FILE *file, const void *buffer, long length)
pdf_output_line_position += length;
/* "foo\nbar\n "... */
if (length > 0 &&
- ((char *)buffer)[length-1] == '\n')
+ ((const char *)buffer)[length-1] == '\n')
pdf_output_line_position = 0;
}
}
@@ -2187,7 +2187,8 @@ find_xref (FILE *pdf_input_file)
mfgets(work_buffer, WORK_BUFFER_SIZE, pdf_input_file);
{
- char *start, *end, *number;
+ const char *start, *end;
+ char *number;
start = work_buffer;
end = start + strlen(work_buffer);
@@ -2219,7 +2220,7 @@ parse_trailer (pdf_file *pf)
WARN("buffer:\n->%s<-\n", work_buffer);
result = NULL;
} else {
- char *p = work_buffer + strlen("trailer");
+ const char *p = work_buffer + strlen("trailer");
skip_white(&p, work_buffer + WORK_BUFFER_SIZE);
result = parse_pdf_dict(&p, work_buffer + WORK_BUFFER_SIZE, pf);
}
@@ -2279,7 +2280,8 @@ pdf_read_object (unsigned long obj_num, unsigned short obj_gen,
pdf_file *pf, long offset, long limit)
{
long length;
- char *buffer, *p, *endptr;
+ char *buffer;
+ const char *p, *endptr;
pdf_obj *result;
length = limit - offset;
@@ -2297,7 +2299,7 @@ pdf_read_object (unsigned long obj_num, unsigned short obj_gen,
/* Check for obj_num and obj_gen */
{
- char *q = p; /* <== p */
+ const char *q = p; /* <== p */
char *sp;
unsigned long n, g;
@@ -2356,7 +2358,8 @@ read_objstm (pdf_file *pf, unsigned long num)
unsigned long offset = pf->xref_table[num].field2;
unsigned short gen = pf->xref_table[num].field3;
long limit = next_object_offset(pf, num), n, first, *header = NULL;
- char *data, data1, *p, *q;
+ char *data = NULL, *q;
+ const char *p, *endptr;
int i;
pdf_obj *objstm, *dict, *type, *n_obj, *first_obj;
@@ -2399,13 +2402,13 @@ read_objstm (pdf_file *pf, unsigned long num)
*(header++) = n;
*(header++) = first;
- data = (char *) pdf_stream_dataptr(objstm);
-
- /* hack to avoid parsing beyond offset table */
- data1 = data[first];
+ /* avoid parsing beyond offset table */
+ data = NEW(first + 1, char);
+ memcpy(data, pdf_stream_dataptr(objstm), first);
data[first] = 0;
- p = data;
+ p = data;
+ endptr = p + first;
i = 2*n;
while (i--) {
*(header++) = strtoul(p, &q, 10);
@@ -2413,17 +2416,19 @@ read_objstm (pdf_file *pf, unsigned long num)
goto error;
p = q;
}
- data[first] = data1;
/* Any garbage after last entry? */
- skip_white(&p, data+first);
- if (p != data+first)
+ skip_white(&p, endptr);
+ if (p != endptr)
goto error;
+ RELEASE(data);
return pf->xref_table[num].direct = objstm;
error:
WARN("Cannot parse object stream.");
+ if (data)
+ RELEASE(data);
if (objstm)
pdf_release_obj(objstm);
return NULL;
@@ -2461,7 +2466,7 @@ pdf_get_object (pdf_file *pf, unsigned long obj_num, unsigned short obj_gen)
unsigned short index = pf->xref_table[obj_num].field3;
pdf_obj *objstm;
long *data, n, first, length;
- char *p, *q;
+ const char *p, *q;
if (objstm_num >= pf->num_obj ||
pf->xref_table[objstm_num].type != 1 ||
@@ -2477,7 +2482,7 @@ pdf_get_object (pdf_file *pf, unsigned long obj_num, unsigned short obj_gen)
goto error;
length = pdf_stream_length(objstm);
- p = (char *) pdf_stream_dataptr(objstm) + first + data[2*index+1];
+ p = (const char *) pdf_stream_dataptr(objstm) + first + data[2*index+1];
q = p + (index == n-1 ? length : first+data[2*index+3]);
result = parse_pdf_object(&p, q, pf);
if (!result)
@@ -2677,7 +2682,7 @@ parse_xrefstm_subsec (pdf_file *pf,
static int
parse_xref_stream (pdf_file *pf, long xref_pos, pdf_obj **trailer)
{
- pdf_obj *xrefstm, *size_obj, *W_obj, *index;
+ pdf_obj *xrefstm, *size_obj, *W_obj, *index_obj;
unsigned long size;
long length;
int W[3], i, wsum = 0;
@@ -2717,22 +2722,22 @@ parse_xref_stream (pdf_file *pf, long xref_pos, pdf_obj **trailer)
p = pdf_stream_dataptr(xrefstm);
- index = pdf_lookup_dict(*trailer, "Index");
- if (index) {
+ index_obj = pdf_lookup_dict(*trailer, "Index");
+ if (index_obj) {
unsigned int index_len;
- if (!PDF_OBJ_ARRAYTYPE(index) ||
- ((index_len = pdf_array_length(index)) % 2 ))
+ if (!PDF_OBJ_ARRAYTYPE(index_obj) ||
+ ((index_len = pdf_array_length(index_obj)) % 2 ))
goto error;
i = 0;
while (i < index_len) {
- pdf_obj *first = pdf_get_array(index, i++);
- pdf_obj *size = pdf_get_array(index, i++);
+ pdf_obj *first = pdf_get_array(index_obj, i++);
+ size_obj = pdf_get_array(index_obj, i++);
if (!PDF_OBJ_NUMBERTYPE(first) ||
- !PDF_OBJ_NUMBERTYPE(size) ||
+ !PDF_OBJ_NUMBERTYPE(size_obj) ||
parse_xrefstm_subsec(pf, &p, &length, W, wsum,
(long) pdf_number_value(first),
- (long) pdf_number_value(size)))
+ (long) pdf_number_value(size_obj)))
goto error;
}
} else if (parse_xrefstm_subsec(pf, &p, &length, W, wsum, 0, size))
diff --git a/Build/source/texk/dvipdfmx/src/pdfparse.c b/Build/source/texk/dvipdfmx/src/pdfparse.c
index 7709e7fced7..586be7f7b92 100644
--- a/Build/source/texk/dvipdfmx/src/pdfparse.c
+++ b/Build/source/texk/dvipdfmx/src/pdfparse.c
@@ -69,7 +69,7 @@ static struct {
static int xtoi (char ch);
-static char *save = NULL;
+static const char *save = NULL;
void
dump (const char *start, const char *end)
@@ -94,7 +94,7 @@ dump (const char *start, const char *end)
} while (0)
void
-skip_line (char **start, char *end)
+skip_line (const char **start, const char *end)
{
while (*start < end && **start != '\n' && **start != '\r')
(*start)++;
@@ -110,7 +110,7 @@ skip_line (char **start, char *end)
}
void
-skip_white (char **start, char *end)
+skip_white (const char **start, const char *end)
{
/*
* The null (NUL; 0x00) character is a white-space character in PDF spec
@@ -144,9 +144,10 @@ parsed_string (const char *start, const char *end)
}
char *
-parse_number (char **start, char *end)
+parse_number (const char **start, const char *end)
{
- char *number, *p;
+ char *number;
+ const char *p;
skip_white(start, end);
p = *start;
@@ -166,9 +167,10 @@ parse_number (char **start, char *end)
}
char *
-parse_unsigned (char **start, char *end)
+parse_unsigned (const char **start, const char *end)
{
- char *number, *p;
+ char *number;
+ const char *p;
skip_white(start, end);
for (p = *start; p < end; p++) {
@@ -182,9 +184,10 @@ parse_unsigned (char **start, char *end)
}
static char *
-parse_gen_ident (char **start, char *end, const char *valid_chars)
+parse_gen_ident (const char **start, const char *end, const char *valid_chars)
{
- char *ident, *p;
+ char *ident;
+ const char *p;
/* No skip_white(start, end)? */
for (p = *start; p < end; p++) {
@@ -198,7 +201,7 @@ parse_gen_ident (char **start, char *end, const char *valid_chars)
}
char *
-parse_ident (char **start, char *end)
+parse_ident (const char **start, const char *end)
{
static const char *valid_chars =
"!\"#$&'*+,-.0123456789:;=?@ABCDEFGHIJKLMNOPQRSTUVWXYZ\\^_`abcdefghijklmnopqrstuvwxyz|~";
@@ -207,7 +210,7 @@ parse_ident (char **start, char *end)
}
char *
-parse_val_ident (char **start, char *end)
+parse_val_ident (const char **start, const char *end)
{
static const char *valid_chars =
"!\"#$&'*+,-./0123456789:;?@ABCDEFGHIJKLMNOPQRSTUVWXYZ\\^_`abcdefghijklmnopqrstuvwxyz|~";
@@ -216,7 +219,7 @@ parse_val_ident (char **start, char *end)
}
char *
-parse_opt_ident (char **start, char *end)
+parse_opt_ident (const char **start, const char *end)
{
if (*start < end && **start == '@') {
(*start)++;
@@ -228,9 +231,9 @@ parse_opt_ident (char **start, char *end)
#define DDIGITS_MAX 10
pdf_obj *
-parse_pdf_number (char **pp, char *endptr)
+parse_pdf_number (const char **pp, const char *endptr)
{
- char *p;
+ const char *p;
unsigned long ipart = 0, dpart = 0;
int nddigits = 0, sign = 1;
int has_dot = 0;
@@ -309,10 +312,10 @@ parse_pdf_number (char **pp, char *endptr)
* PDF-1.2+: Two hexadecimal digits preceded by a number sign.
*/
static int
-pn_getc (char **pp, char *endptr)
+pn_getc (const char **pp, const char *endptr)
{
int ch = 0;
- char *p;
+ const char *p;
p = *pp;
if (p[0] == '#') {
@@ -348,7 +351,7 @@ static char sbuf[PDF_STRING_LEN_MAX+1];
pdf_obj *
-parse_pdf_name (char **pp, char *endptr)
+parse_pdf_name (const char **pp, const char *endptr)
{
char name[PDF_NAME_LEN_MAX+1];
int ch, len = 0;
@@ -386,7 +389,7 @@ parse_pdf_name (char **pp, char *endptr)
}
pdf_obj *
-parse_pdf_boolean (char **pp, char *endptr)
+parse_pdf_boolean (const char **pp, const char *endptr)
{
skip_white(pp, endptr);
if (*pp + 4 <= endptr &&
@@ -411,7 +414,7 @@ parse_pdf_boolean (char **pp, char *endptr)
}
pdf_obj *
-parse_pdf_null (char **pp, char *endptr)
+parse_pdf_null (const char **pp, const char *endptr)
{
skip_white(pp, endptr);
if (*pp + 4 > endptr) {
@@ -438,10 +441,10 @@ parse_pdf_null (char **pp, char *endptr)
#define isodigit(c) ((c) >= '0' && (c) <= '7')
#endif
static int
-ps_getescc (char **pp, char *endptr)
+ps_getescc (const char **pp, const char *endptr)
{
int ch, i;
- char *p;
+ const char *p;
p = *pp + 1; /* backslash assumed. */
switch (p[0]) {
@@ -489,10 +492,10 @@ ps_getescc (char **pp, char *endptr)
}
static pdf_obj *
-parse_pdf_literal_string (char **pp, char *endptr)
+parse_pdf_literal_string (const char **pp, const char *endptr)
{
int ch, op_count = 0, len = 0;
- char *p;
+ const char *p;
p = *pp;
@@ -594,9 +597,9 @@ xtoi (char ch)
}
static pdf_obj *
-parse_pdf_hex_string (char **pp, char *endptr)
+parse_pdf_hex_string (const char **pp, const char *endptr)
{
- char *p;
+ const char *p;
long len;
p = *pp;
@@ -643,7 +646,7 @@ parse_pdf_hex_string (char **pp, char *endptr)
}
pdf_obj *
-parse_pdf_string (char **pp, char *endptr)
+parse_pdf_string (const char **pp, const char *endptr)
{
skip_white(pp, endptr);
if (*pp + 2 <= endptr) {
@@ -662,7 +665,7 @@ parse_pdf_string (char **pp, char *endptr)
#ifndef PDF_PARSE_STRICT
pdf_obj *
-parse_pdf_tainted_dict (char **pp, char *endptr)
+parse_pdf_tainted_dict (const char **pp, const char *endptr)
{
pdf_obj *result;
@@ -674,17 +677,17 @@ parse_pdf_tainted_dict (char **pp, char *endptr)
}
#else /* PDF_PARSE_STRICT */
pdf_obj *
-parse_pdf_tainted_dict (char **pp, char *endptr)
+parse_pdf_tainted_dict (const char **pp, const char *endptr)
{
return parse_pdf_dict(pp, endptr, NULL);
}
#endif /* !PDF_PARSE_STRICT */
pdf_obj *
-parse_pdf_dict (char **pp, char *endptr, pdf_file *pf)
+parse_pdf_dict (const char **pp, const char *endptr, pdf_file *pf)
{
pdf_obj *result = NULL;
- char *p;
+ const char *p;
p = *pp;
@@ -738,10 +741,10 @@ parse_pdf_dict (char **pp, char *endptr, pdf_file *pf)
}
pdf_obj *
-parse_pdf_array (char **pp, char *endptr, pdf_file *pf)
+parse_pdf_array (const char **pp, const char *endptr, pdf_file *pf)
{
pdf_obj *result;
- char *p;
+ const char *p;
p = *pp;
@@ -781,10 +784,10 @@ parse_pdf_array (char **pp, char *endptr, pdf_file *pf)
}
static pdf_obj *
-parse_pdf_stream (char **pp, char *endptr, pdf_obj *dict, pdf_file *pf)
+parse_pdf_stream (const char **pp, const char *endptr, pdf_obj *dict, pdf_file *pf)
{
pdf_obj *result = NULL;
- char *p;
+ const char *p;
pdf_obj *stream_dict;
long stream_length;
@@ -886,7 +889,7 @@ parse_pdf_stream (char **pp, char *endptr, pdf_obj *dict, pdf_file *pf)
/* This is not PDF indirect reference. */
static pdf_obj *
-parse_pdf_reference (char **start, char *end)
+parse_pdf_reference (const char **start, const char *end)
{
pdf_obj *result = NULL;
char *name;
@@ -913,7 +916,7 @@ parse_pdf_reference (char **start, char *end)
#endif /* !PDF_PARSE_STRICT */
static pdf_obj *
-try_pdf_reference (char *start, char *end, char **endptr, pdf_file *pf)
+try_pdf_reference (const char *start, const char *end, const char **endptr, pdf_file *pf)
{
unsigned long id = 0;
unsigned short gen = 0;
@@ -959,11 +962,11 @@ try_pdf_reference (char *start, char *end, char **endptr, pdf_file *pf)
}
pdf_obj *
-parse_pdf_object (char **pp, char *endptr, pdf_file *pf)
+parse_pdf_object (const char **pp, const char *endptr, pdf_file *pf)
/* If pf is NULL, then indirect references are not allowed */
{
pdf_obj *result = NULL;
- char *nextptr;
+ const char *nextptr;
skip_white(pp, endptr);
if (*pp >= endptr) {
diff --git a/Build/source/texk/dvipdfmx/src/pdfparse.h b/Build/source/texk/dvipdfmx/src/pdfparse.h
index a02721be9df..327b0cfc60e 100644
--- a/Build/source/texk/dvipdfmx/src/pdfparse.h
+++ b/Build/source/texk/dvipdfmx/src/pdfparse.h
@@ -31,25 +31,25 @@
/* Please remove this */
extern void dump (const char *start, const char *end);
-extern void skip_line (char **start, char *end);
-extern void skip_white (char **start, char *end);
-
-extern char *parse_number (char **start, char *end);
-extern char *parse_unsigned (char **start, char *end);
-
-extern char *parse_ident (char **start, char *end);
-extern char *parse_val_ident (char **start, char *end);
-extern char *parse_opt_ident (char **start, char *end);
-
-extern pdf_obj *parse_pdf_name (char **pp, char *endptr);
-extern pdf_obj *parse_pdf_boolean (char **pp, char *endptr);
-extern pdf_obj *parse_pdf_number (char **pp, char *endptr);
-extern pdf_obj *parse_pdf_null (char **pp, char *endptr);
-extern pdf_obj *parse_pdf_string (char **pp, char *endptr);
-extern pdf_obj *parse_pdf_dict (char **pp, char *endptr, pdf_file *pf);
-extern pdf_obj *parse_pdf_array (char **pp, char *endptr, pdf_file *pf);
-extern pdf_obj *parse_pdf_object (char **pp, char *endptr, pdf_file *pf);
-
-extern pdf_obj *parse_pdf_tainted_dict (char **pp, char *endptr);
+extern void skip_line (const char **start, const char *end);
+extern void skip_white (const char **start, const char *end);
+
+extern char *parse_number (const char **start, const char *end);
+extern char *parse_unsigned (const char **start, const char *end);
+
+extern char *parse_ident (const char **start, const char *end);
+extern char *parse_val_ident (const char **start, const char *end);
+extern char *parse_opt_ident (const char **start, const char *end);
+
+extern pdf_obj *parse_pdf_name (const char **pp, const char *endptr);
+extern pdf_obj *parse_pdf_boolean (const char **pp, const char *endptr);
+extern pdf_obj *parse_pdf_number (const char **pp, const char *endptr);
+extern pdf_obj *parse_pdf_null (const char **pp, const char *endptr);
+extern pdf_obj *parse_pdf_string (const char **pp, const char *endptr);
+extern pdf_obj *parse_pdf_dict (const char **pp, const char *endptr, pdf_file *pf);
+extern pdf_obj *parse_pdf_array (const char **pp, const char *endptr, pdf_file *pf);
+extern pdf_obj *parse_pdf_object (const char **pp, const char *endptr, pdf_file *pf);
+
+extern pdf_obj *parse_pdf_tainted_dict (const char **pp, const char *endptr);
#endif /* _PDFPARSE_H_ */
diff --git a/Build/source/texk/dvipdfmx/src/pst_obj.c b/Build/source/texk/dvipdfmx/src/pst_obj.c
index 84c3fe4885f..67b47572c15 100644
--- a/Build/source/texk/dvipdfmx/src/pst_obj.c
+++ b/Build/source/texk/dvipdfmx/src/pst_obj.c
@@ -123,7 +123,11 @@ pst_new_obj (pst_type type, void *data)
pst_obj *
pst_new_mark (void)
{
- return pst_new_obj(PST_TYPE_MARK, (void *)pst_const_mark);
+ char *q;
+
+ q = NEW(strlen(pst_const_mark)+1, char);
+ strcpy(q, pst_const_mark);
+ return pst_new_obj(PST_TYPE_MARK, (void *)q);
}
void
@@ -138,7 +142,6 @@ pst_release_obj (pst_obj *obj)
case PST_TYPE_STRING: pst_string_release(obj->data); break;
case PST_TYPE_NULL:
case PST_TYPE_MARK:
- break;
case PST_TYPE_UNKNOWN:
if (obj->data)
RELEASE(obj->data);
@@ -388,8 +391,12 @@ pst_parse_null (unsigned char **inbuf, unsigned char *inbufend)
if (*inbuf + 4 <= inbufend &&
memcmp(*inbuf, "null", 4) == 0 &&
PST_TOKEN_END(*inbuf+4, inbufend)) {
+ char *q;
+
*inbuf += 4;
- return pst_new_obj(PST_TYPE_NULL, (void*)pst_const_null);
+ q = NEW(strlen(pst_const_null)+1, char);
+ strcpy(q, pst_const_null);
+ return pst_new_obj(PST_TYPE_NULL, (void*)q);
} else
return NULL;
}
diff --git a/Build/source/texk/dvipdfmx/src/spc_color.c b/Build/source/texk/dvipdfmx/src/spc_color.c
index c1b730b6059..7f43777b200 100644
--- a/Build/source/texk/dvipdfmx/src/spc_color.c
+++ b/Build/source/texk/dvipdfmx/src/spc_color.c
@@ -109,9 +109,9 @@ spc_handler_background (struct spc_env *spe, struct spc_arg *args)
#define ISBLANK(c) ((c) == ' ' || (c) == '\t' || (c) == '\v')
#endif
static void
-skip_blank (char **pp, char *endptr)
+skip_blank (const char **pp, const char *endptr)
{
- char *p = *pp;
+ const char *p = *pp;
for ( ; p < endptr && ISBLANK(*p); p++);
*pp = p;
}
@@ -120,9 +120,10 @@ int
spc_color_check_special (const char *buf, long len)
{
int r = 0;
- char *q, *p, *endptr;
+ const char *p, *endptr;
+ char *q;
- p = (char *) buf;
+ p = buf;
endptr = p + len;
skip_blank(&p, endptr);
@@ -143,7 +144,8 @@ extern int
spc_color_setup_handler (struct spc_handler *sph,
struct spc_env *spe, struct spc_arg *ap)
{
- char *p, *q;
+ const char *p;
+ char *q;
ASSERT(sph && spe && ap);
@@ -154,7 +156,7 @@ spc_color_setup_handler (struct spc_handler *sph,
skip_blank(&ap->curptr, ap->endptr);
if (!strcmp(q, "background")) {
- ap->command = (char *) "background";
+ ap->command = "background";
sph->exec = &spc_handler_background;
RELEASE(q);
} else if (!strcmp(q, "color")) { /* color */
@@ -165,15 +167,15 @@ spc_color_setup_handler (struct spc_handler *sph,
if (!q)
return -1;
else if (!strcmp(q, "push")) {
- ap->command = (char *) "push";
+ ap->command = "push";
sph->exec = &spc_handler_color_push;
ap->curptr = p;
} else if (!strcmp(q, "pop")) {
- ap->command = (char *) "pop";
+ ap->command = "pop";
sph->exec = &spc_handler_color_pop;
ap->curptr = p;
} else { /* cmyk, rgb, ... */
- ap->command = (char *) "";
+ ap->command = "";
sph->exec = &spc_handler_color_default;
}
RELEASE(q);
diff --git a/Build/source/texk/dvipdfmx/src/spc_dvips.c b/Build/source/texk/dvipdfmx/src/spc_dvips.c
index 5f02f0bfbc5..da4c84b3f68 100644
--- a/Build/source/texk/dvipdfmx/src/spc_dvips.c
+++ b/Build/source/texk/dvipdfmx/src/spc_dvips.c
@@ -55,9 +55,10 @@ static double pending_y = 0.0;
static int position_set = 0;
static char *
-parse_filename (char **pp, char *endptr)
+parse_filename (const char **pp, const char *endptr)
{
- char *r, *q = NULL, *p = *pp;
+ char *r;
+ const char *q = NULL, *p = *pp;
char qchar;
int n;
@@ -302,11 +303,11 @@ spc_dvips_at_end_page (void)
int
spc_dvips_check_special (const char *buf, long len)
{
- char *p, *endptr;
+ const char *p, *endptr;
int i;
- p = (char *) buf;
- endptr = p + len;
+ p = buf;
+ endptr = p + len;
skip_white(&p, endptr);
if (p >= endptr)
@@ -329,7 +330,7 @@ int
spc_dvips_setup_handler (struct spc_handler *handle,
struct spc_env *spe, struct spc_arg *args)
{
- char *key;
+ const char *key;
int i, keylen;
ASSERT(handle && spe && args);
@@ -363,9 +364,9 @@ spc_dvips_setup_handler (struct spc_handler *handle,
skip_white(&args->curptr, args->endptr);
- args->command = (char *) dvips_handlers[i].key;
+ args->command = dvips_handlers[i].key;
- handle->key = (char *) "ps:";
+ handle->key = "ps:";
handle->exec = dvips_handlers[i].exec;
return 0;
diff --git a/Build/source/texk/dvipdfmx/src/spc_html.c b/Build/source/texk/dvipdfmx/src/spc_html.c
index 35fbdbbdbb9..04969db7b01 100644
--- a/Build/source/texk/dvipdfmx/src/spc_html.c
+++ b/Build/source/texk/dvipdfmx/src/spc_html.c
@@ -72,7 +72,7 @@ static struct spc_html_ _html_state = {
#ifdef ENABLE_HTML_SVG_TRANSFORM
-static int cvt_a_to_tmatrix (pdf_tmatrix *M, const char *ptr, char **nextptr);
+static int cvt_a_to_tmatrix (pdf_tmatrix *M, const char *ptr, const char **nextptr);
#endif /* ENABLE_HTML_SVG_TRANSFORM */
#define \
@@ -88,9 +88,10 @@ if ((s)) { \
}
static int
-parse_key_val (char **pp, char *endptr, char **kp, char **vp)
+parse_key_val (const char **pp, const char *endptr, char **kp, char **vp)
{
- char *q, *p, *k, *v;
+ const char *q, *p;
+ char *k, *v;
int n, error = 0;
for (p = *pp ; p < endptr && isspace(*p); p++);
@@ -157,9 +158,9 @@ parse_key_val (char **pp, char *endptr, char **kp, char **vp)
#define HTML_TAG_TYPE_CLOSE 2
static int
-read_html_tag (char *name, pdf_obj *attr, int *type, char **pp, char *endptr)
+read_html_tag (char *name, pdf_obj *attr, int *type, const char **pp, const char *endptr)
{
- char *p = *pp;
+ const char *p = *pp;
int n = 0, error = 0;
for ( ; p < endptr && isspace(*p); p++);
@@ -477,7 +478,8 @@ spc_html__base_empty (struct spc_env *spe, pdf_obj *attr, struct spc_html_ *sd)
static double
atopt (const char *a)
{
- char *q, *p = (char *) a;
+ char *q;
+ const char *p = a;
double v, u = 1.0;
const char *_ukeys[] = {
#define K_UNIT__PT 0
@@ -613,7 +615,7 @@ spc_html__img_empty (struct spc_env *spe, pdf_obj *attr, struct spc_html_ *sd)
#ifdef ENABLE_HTML_SVG_TRANSFORM
obj = pdf_lookup_dict(attr, "svg:transform");
if (obj) {
- char *p = (char *) pdf_string_value(obj);
+ const char *p = pdf_string_value(obj);
pdf_tmatrix N;
for ( ; *p && isspace(*p); p++);
while (*p && !error) {
@@ -760,9 +762,10 @@ spc_handler_html_default (struct spc_env *spe, struct spc_arg *ap)
#ifdef ENABLE_HTML_SVG_TRANSFORM
/* translate wsp* '(' wsp* number (comma-wsp number)? wsp* ')' */
static int
-cvt_a_to_tmatrix (pdf_tmatrix *M, const char *ptr, char **nextptr)
+cvt_a_to_tmatrix (pdf_tmatrix *M, const char *ptr, const char **nextptr)
{
- char *q, *p = (char *) ptr;
+ char *q;
+ const char *p = ptr;
int n;
double v[6];
static const char *_tkeys[] = {
@@ -899,9 +902,9 @@ spc_html_at_end_document (void)
int
spc_html_check_special (const char *buffer, long size)
{
- char *p, *endptr;
+ const char *p, *endptr;
- p = (char *) buffer;
+ p = buffer;
endptr = p + size;
for ( ; p < endptr && isspace(*p); p++);
@@ -927,9 +930,9 @@ spc_html_setup_handler (struct spc_handler *sph,
return -1;
}
- ap->command = (char *) "";
+ ap->command = "";
- sph->key = (char *) "html:";
+ sph->key = "html:";
sph->exec = &spc_handler_html_default;
ap->curptr += strlen("html:");
diff --git a/Build/source/texk/dvipdfmx/src/spc_misc.c b/Build/source/texk/dvipdfmx/src/spc_misc.c
index 6475dfd25fe..fad669accd0 100644
--- a/Build/source/texk/dvipdfmx/src/spc_misc.c
+++ b/Build/source/texk/dvipdfmx/src/spc_misc.c
@@ -101,7 +101,7 @@ spc_handler_postscriptbox (struct spc_env *spe, struct spc_arg *ap)
ti.flags |= (INFO_HAS_WIDTH|INFO_HAS_HEIGHT);
for (;;) {
- char *p = mfgets(buf, 512, fp);
+ const char *p = mfgets(buf, 512, fp);
if (!p)
break;
if (mps_scan_bbox(&p, p + strlen(p), &ti.bbox) >= 0) {
@@ -143,10 +143,10 @@ static struct spc_handler misc_handlers[] = {
int
spc_misc_check_special (const char *buffer, long size)
{
- char *p, *endptr;
+ const char *p, *endptr;
int i;
- p = (char *) buffer;
+ p = buffer;
endptr = p + size;
skip_white(&p, endptr);
@@ -167,7 +167,7 @@ int
spc_misc_setup_handler (struct spc_handler *handle,
struct spc_env *spe, struct spc_arg *args)
{
- char *key;
+ const char *key;
int i, keylen;
ASSERT(handle && spe && args);
@@ -197,9 +197,9 @@ spc_misc_setup_handler (struct spc_handler *handle,
skip_white(&args->curptr, args->endptr);
- args->command = (char *) misc_handlers[i].key;
+ args->command = misc_handlers[i].key;
- handle->key = (char *) "???:";
+ handle->key = "???:";
handle->exec = misc_handlers[i].exec;
return 0;
diff --git a/Build/source/texk/dvipdfmx/src/spc_pdfm.c b/Build/source/texk/dvipdfmx/src/spc_pdfm.c
index ca1595e2ca9..da5f242296b 100644
--- a/Build/source/texk/dvipdfmx/src/spc_pdfm.c
+++ b/Build/source/texk/dvipdfmx/src/spc_pdfm.c
@@ -482,7 +482,7 @@ modstrings (pdf_obj *kp, pdf_obj *vp, void *dp)
}
static pdf_obj *
-my_parse_pdf_dict (char **pp, char *endptr, struct tounicode *cd)
+my_parse_pdf_dict (const char **pp, const char *endptr, struct tounicode *cd)
{
pdf_obj *dict;
@@ -1950,9 +1950,9 @@ int
spc_pdfm_check_special (const char *buf, long len)
{
int r = 0;
- char *p, *endptr;
+ const char *p, *endptr;
- p = (char *) buf;
+ p = buf;
endptr = p + len;
skip_white(&p, endptr);
@@ -1987,8 +1987,8 @@ spc_pdfm_setup_handler (struct spc_handler *sph,
for (i = 0;
i < sizeof(pdfm_handlers) / sizeof(struct spc_handler); i++) {
if (!strcmp(q, pdfm_handlers[i].key)) {
- ap->command = (char *) pdfm_handlers[i].key;
- sph->key = (char *) "pdf:";
+ ap->command = pdfm_handlers[i].key;
+ sph->key = "pdf:";
sph->exec = pdfm_handlers[i].exec;
skip_white(&ap->curptr, ap->endptr);
error = 0;
diff --git a/Build/source/texk/dvipdfmx/src/spc_tpic.c b/Build/source/texk/dvipdfmx/src/spc_tpic.c
index 100ead5eadf..2c821556030 100644
--- a/Build/source/texk/dvipdfmx/src/spc_tpic.c
+++ b/Build/source/texk/dvipdfmx/src/spc_tpic.c
@@ -67,9 +67,9 @@
#endif
static void
-skip_blank (char **pp, char *endptr)
+skip_blank (const char **pp, const char *endptr)
{
- char *p = *pp;
+ const char *p = *pp;
for ( ; p < endptr && ISBLANK(*p); p++);
*pp = p;
}
@@ -984,10 +984,11 @@ int
spc_tpic_check_special (const char *buf, long len)
{
int istpic = 0;
- char *q, *p, *endptr;
+ char *q;
+ const char *p, *endptr;
int i, hasnsp = 0;
- p = (char *) buf;
+ p = buf;
endptr = p + len;
skip_blank(&p, endptr);
@@ -1047,8 +1048,8 @@ spc_tpic_setup_handler (struct spc_handler *sph,
error = -1;
else if (q && hasnsp && !strcmp(q, "__setopt__")) {
#if DEBUG
- ap->command = (char *) "__setopt__";
- sph->key = (char *) "tpic:";
+ ap->command = "__setopt__";
+ sph->key = "tpic:";
sph->exec = spc_handler_tpic__setopts;
skip_blank(&ap->curptr, ap->endptr);
error = 0;
@@ -1058,8 +1059,8 @@ spc_tpic_setup_handler (struct spc_handler *sph,
for (i = 0;
i < sizeof(tpic_handlers)/sizeof(struct spc_handler); i++) {
if (!strcmp(q, tpic_handlers[i].key)) {
- ap->command = (char *) tpic_handlers[i].key;
- sph->key = (char *) "tpic:";
+ ap->command = tpic_handlers[i].key;
+ sph->key = "tpic:";
sph->exec = tpic_handlers[i].exec;
skip_blank(&ap->curptr, ap->endptr);
error = 0;
diff --git a/Build/source/texk/dvipdfmx/src/spc_util.c b/Build/source/texk/dvipdfmx/src/spc_util.c
index d3db0e4cf25..198a2c402fb 100644
--- a/Build/source/texk/dvipdfmx/src/spc_util.c
+++ b/Build/source/texk/dvipdfmx/src/spc_util.c
@@ -45,9 +45,9 @@
#define ISBLANK(c) ((c) == ' ' || (c) == '\t')
#endif
static void
-skip_blank (char **pp, char *endptr)
+skip_blank (const char **pp, const char *endptr)
{
- char *p = *pp;
+ const char *p = *pp;
for ( ; p < endptr && ISBLANK(*p); p++);
*pp = p;
}
diff --git a/Build/source/texk/dvipdfmx/src/specials.c b/Build/source/texk/dvipdfmx/src/specials.c
index 3c04720b451..10c366cbb7f 100644
--- a/Build/source/texk/dvipdfmx/src/specials.c
+++ b/Build/source/texk/dvipdfmx/src/specials.c
@@ -332,7 +332,7 @@ init_special (struct spc_handler *special,
spe->mag = mag;
spe->pg = pdf_doc_current_page_number(); /* _FIXME_ */
- args->curptr = (char *) p;
+ args->curptr = p;
args->endptr = args->curptr + size;
args->base = args->curptr;
args->command = NULL;
@@ -495,7 +495,8 @@ spc_exec_at_end_document (void)
static void
print_error (const char *name, struct spc_env *spe, struct spc_arg *ap)
{
- char *p, ebuf[64];
+ const char *p;
+ char ebuf[64];
int i;
long pg = spe->pg;
pdf_coord c;
@@ -553,7 +554,7 @@ spc_exec_special (const char *buffer, long size,
struct spc_handler special;
if (verbose > 3) {
- dump((char *) buffer, (char *) buffer + size);
+ dump(buffer, buffer + size);
}
init_special(&special, &spe, &args, buffer, size, x_user, y_user, mag);
diff --git a/Build/source/texk/dvipdfmx/src/specials.h b/Build/source/texk/dvipdfmx/src/specials.h
index 8cd2ceda1bf..5d13c47fa04 100644
--- a/Build/source/texk/dvipdfmx/src/specials.h
+++ b/Build/source/texk/dvipdfmx/src/specials.h
@@ -32,11 +32,11 @@ struct spc_env {
};
struct spc_arg {
- char *curptr;
- char *endptr;
- char *base;
+ const char *curptr;
+ const char *endptr;
+ const char *base;
- char *command;
+ const char *command;
};
typedef int (*spc_handler_fn_ptr) (struct spc_env *, struct spc_arg *);
diff --git a/Build/source/texk/dvipdfmx/src/subfont.c b/Build/source/texk/dvipdfmx/src/subfont.c
index ed299303f53..9448601910e 100644
--- a/Build/source/texk/dvipdfmx/src/subfont.c
+++ b/Build/source/texk/dvipdfmx/src/subfont.c
@@ -168,7 +168,8 @@ readline (char *buf, int buf_len, FILE *fp)
static int
read_sfd_record (struct sfd_rec_ *rec, const char *lbuf)
{
- char *p = (char *) lbuf, *q;
+ const char *p = lbuf, *q;
+ char *r;
int repos = 0;
long c, v1 = 0, v2 = 0;
int curpos = 0;
@@ -178,7 +179,8 @@ read_sfd_record (struct sfd_rec_ *rec, const char *lbuf)
for ( ; *p && isspace(*p); p++);
while (!error && *p) {
repos = 0; q = p;
- v1 = strtol(p, &q, 0);
+ v1 = strtol(p, &r, 0);
+ q = r;
if (q == p ||
(!IS_TOKSEP(*q) && *q != ':' && *q != '_')) {
WARN("Unknown token in subfont mapping table: %c", *q);
@@ -196,7 +198,8 @@ read_sfd_record (struct sfd_rec_ *rec, const char *lbuf)
break;
case '_':
p = q + 1;
- v2 = strtol(p, &q, 0);
+ v2 = strtol(p, &r, 0);
+ q = r;
if (v1 < 0 || v1 > 0xffffL ||
v2 < 0 || v2 > 0xffffL) {
WARN("Invalid value in subfont mapping table: 0x%x_0x%x", v1, v2);
diff --git a/Build/source/texk/dvipdfmx/src/t1_char.c b/Build/source/texk/dvipdfmx/src/t1_char.c
index 333d9b3d17a..59bb0793178 100644
--- a/Build/source/texk/dvipdfmx/src/t1_char.c
+++ b/Build/source/texk/dvipdfmx/src/t1_char.c
@@ -265,10 +265,10 @@ static int CDECL
stem_compare (const void *v1, const void *v2)
{
int cmp = 0;
- t1_stem *s1, *s2;
+ const t1_stem *s1, *s2;
- s1 = (t1_stem *) v1;
- s2 = (t1_stem *) v2;
+ s1 = (const t1_stem *) v1;
+ s2 = (const t1_stem *) v2;
if (s1->dir == s2->dir) {
if (s1->pos == s2->pos) {
if (s1->del == s2->del)
diff --git a/Build/source/texk/dvipdfmx/src/t1_load.c b/Build/source/texk/dvipdfmx/src/t1_load.c
index d58428cf616..36629b35730 100644
--- a/Build/source/texk/dvipdfmx/src/t1_load.c
+++ b/Build/source/texk/dvipdfmx/src/t1_load.c
@@ -1073,13 +1073,13 @@ get_pfb_segment (FILE *fp, int expected_type, long *length)
return buffer;
}
-char *
+const char *
t1_get_standard_glyph (int code)
{
if (!StandardEncoding[code])
return NULL;
- return (char *) StandardEncoding[code];
+ return StandardEncoding[code];
}
int
diff --git a/Build/source/texk/dvipdfmx/src/t1_load.h b/Build/source/texk/dvipdfmx/src/t1_load.h
index c1c7ca2ea9f..95683612fbf 100644
--- a/Build/source/texk/dvipdfmx/src/t1_load.h
+++ b/Build/source/texk/dvipdfmx/src/t1_load.h
@@ -6,6 +6,6 @@
extern cff_font *t1_load_font (char **enc_vec, int mode, FILE *fp);
extern int is_pfb (FILE *fp);
extern int t1_get_fontname (FILE *fp, char *fontname);
-extern char *t1_get_standard_glyph (int code);
+extern const char *t1_get_standard_glyph (int code);
#endif /* _T1_LOAD_H_ */
diff --git a/Build/source/texk/dvipdfmx/src/truetype.c b/Build/source/texk/dvipdfmx/src/truetype.c
index 3d70e8dcbd6..d8811ddb0e3 100644
--- a/Build/source/texk/dvipdfmx/src/truetype.c
+++ b/Build/source/texk/dvipdfmx/src/truetype.c
@@ -444,6 +444,7 @@ static int
selectglyph (USHORT in, const char *suffix, struct glyph_mapper *gm, USHORT *out)
{
char *s, *q, t[5];
+ const char *r;
int n, error = 0;
ASSERT(suffix && gm && out);
@@ -456,9 +457,9 @@ selectglyph (USHORT in, const char *suffix, struct glyph_mapper *gm, USHORT *out
* agl.c currently only knows less ambiguos cases;
* e.g., 'sc', 'superior', etc.
*/
- q = (char *) agl_suffix_to_otltag(s);
- if (q) { /* We found feature tag for 'suffix'. */
- error = select_gsub(q, gm); /* no fallback for this */
+ r = agl_suffix_to_otltag(s);
+ if (r) { /* We found feature tag for 'suffix'. */
+ error = select_gsub(r, gm); /* no fallback for this */
if (!error)
error = otl_gsub_apply(gm->gsub, &in);
} else { /* 'suffix' may represent feature tag. */
diff --git a/Build/source/texk/dvipdfmx/src/tt_glyf.c b/Build/source/texk/dvipdfmx/src/tt_glyf.c
index ca8e73a0604..4d208d40095 100644
--- a/Build/source/texk/dvipdfmx/src/tt_glyf.c
+++ b/Build/source/texk/dvipdfmx/src/tt_glyf.c
@@ -167,10 +167,10 @@ static int CDECL
glyf_cmp (const void *v1, const void *v2)
{
int cmp = 0;
- struct tt_glyph_desc *sv1, *sv2;
+ const struct tt_glyph_desc *sv1, *sv2;
- sv1 = (struct tt_glyph_desc *) v1;
- sv2 = (struct tt_glyph_desc *) v2;
+ sv1 = (const struct tt_glyph_desc *) v1;
+ sv2 = (const struct tt_glyph_desc *) v2;
if (sv1->gid == sv2->gid)
cmp = 0;
diff --git a/Build/source/texk/dvipdfmx/src/tt_post.c b/Build/source/texk/dvipdfmx/src/tt_post.c
index 8588a6d03bd..489e77bccd6 100644
--- a/Build/source/texk/dvipdfmx/src/tt_post.c
+++ b/Build/source/texk/dvipdfmx/src/tt_post.c
@@ -30,7 +30,7 @@
#include "tt_post.h"
-static const char *const macglyphorder[258];
+static const char *macglyphorder[258];
/* offset from begenning of the post table */
#define NAME_STR_OFFSET 32
@@ -74,11 +74,11 @@ read_v2_post_names (struct tt_post_table *post, sfnt *sfont)
}
}
- post->glyphNamePtr = NEW(post->numberOfGlyphs, char *);
+ post->glyphNamePtr = NEW(post->numberOfGlyphs, const char *);
for (i = 0; i < post->numberOfGlyphs; i++) {
idx = indices[i];
if (idx < 258) {
- post->glyphNamePtr[i] = (char *) macglyphorder[idx];
+ post->glyphNamePtr[i] = macglyphorder[idx];
} else if (idx - 258 < post->count) {
post->glyphNamePtr[i] = post->names[idx - 258];
} else {
@@ -120,7 +120,7 @@ tt_read_post_table (sfnt *sfont)
if (post->Version == 0x00010000UL) {
post->numberOfGlyphs = 258; /* wrong */
- post->glyphNamePtr = (char **) macglyphorder;
+ post->glyphNamePtr = macglyphorder;
post->count = 0;
post->names = NULL;
} else if (post->Version == 0x00025000UL) {
@@ -192,7 +192,7 @@ tt_release_post_table (struct tt_post_table *post)
}
/* Macintosh glyph order - from apple's TTRefMan */
-static const char *const
+static const char *
macglyphorder[258] = {
/* 0x0000 */
".notdef", ".null", "nonmarkingreturn", "space", "exclam", "quotedbl",
diff --git a/Build/source/texk/dvipdfmx/src/tt_post.h b/Build/source/texk/dvipdfmx/src/tt_post.h
index 4a9884524e9..414c680a570 100644
--- a/Build/source/texk/dvipdfmx/src/tt_post.h
+++ b/Build/source/texk/dvipdfmx/src/tt_post.h
@@ -39,7 +39,7 @@ struct tt_post_table
USHORT numberOfGlyphs;
- char **glyphNamePtr; /* Glyph names (pointer to C string) */
+ const char **glyphNamePtr; /* Glyph names (pointer to C string) */
char **names; /* Non-standard glyph names */
USHORT count; /* Number of glyph names in names[] */
diff --git a/Build/source/texk/dvipdfmx/src/type1.c b/Build/source/texk/dvipdfmx/src/type1.c
index 95bc083370c..b5e683092aa 100644
--- a/Build/source/texk/dvipdfmx/src/type1.c
+++ b/Build/source/texk/dvipdfmx/src/type1.c
@@ -706,7 +706,7 @@ pdf_font_load_type1 (pdf_font *font)
cstring->offset[gid + 1] = offset + 1;
if (gm.use_seac) {
long bchar_gid, achar_gid, i;
- char *bchar_name, *achar_name;
+ const char *bchar_name, *achar_name;
/*
* NOTE:
diff --git a/Build/source/texk/dvipdfmx/src/xbb.c b/Build/source/texk/dvipdfmx/src/xbb.c
index fd329548dbd..70a87f0344a 100644
--- a/Build/source/texk/dvipdfmx/src/xbb.c
+++ b/Build/source/texk/dvipdfmx/src/xbb.c
@@ -78,7 +78,7 @@ static void do_time(FILE *file)
fprintf(file, "%%%%CreationDate: %s\n", asctime(bd_time));
}
-char *extensions[] = {
+const char *extensions[] = {
".jpeg", ".JPEG", ".jpg", ".JPG", ".pdf", ".PDF", ".png", ".PNG"
};