diff options
author | Jonathan Kew <jfkthame@googlemail.com> | 2008-03-27 09:14:58 +0000 |
---|---|---|
committer | Jonathan Kew <jfkthame@googlemail.com> | 2008-03-27 09:14:58 +0000 |
commit | 8fa331c4a7ed20194a81c2a9c5a9511ca2ab66dd (patch) | |
tree | ee493d30c99ceb5c734a159563bede09e88fe6be /Build/source/texk/web2c/xetexdir | |
parent | ee5049fdbb8acbbac0e06dd1450e94a3ccdba59f (diff) |
clean up some const-string warnings
git-svn-id: svn://tug.org/texlive/trunk@7184 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/xetexdir')
-rw-r--r-- | Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/XeTeX_ext.c | 8 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/XeTeX_ext.h | 3 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/appleGlyphNames.c | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/xetex.ch | 4 |
5 files changed, 8 insertions, 11 deletions
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp b/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp index c3dd0d2b695..26936bc9d66 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp +++ b/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp @@ -694,7 +694,7 @@ findGlyphInPostTable(const char* buffer, int tableSize, const char* glyphName) switch (SWAP(p->format)) { case 0x00010000: { - char* cp; + const char* cp; while ((cp = appleGlyphNames[g]) != 0) { if (strcmp(glyphName, cp) == 0) return g; diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c index e49cb8abe06..2dfae15fa7f 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c +++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c @@ -169,8 +169,8 @@ const UInt32 byteMark = 0x00000080UL; /* if the user specifies a paper size or output driver program */ -string papersize; -string outputdriver = "xdvipdfmx -q -E"; /* default to portable xdvipdfmx driver */ +const_string papersize; +const_string outputdriver = "xdvipdfmx -q -E"; /* default to portable xdvipdfmx driver */ void initversionstring(char **versions) @@ -181,7 +181,7 @@ void initversionstring(char **versions) extern FT_Library gFreeTypeLibrary; /* in XeTeXFontInst_FT2 */ FT_Int ftMajor, ftMinor, ftPatch; - char* fmt = + const_string fmt = "Compiled with ICU version %s [with modifications for XeTeX]\n" "Compiled with zlib version %s; using %s\n" "Compiled with FreeType2 version %d.%d.%d; using %d.%d.%d\n" @@ -348,7 +348,7 @@ static char* byteBuffer = NULL; return true; } -static void die(char*s, int i) +static void die(const_string s, int i) { fprintf(stderr, s, i); fprintf(stderr, " - exiting\n"); diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h index e019569969e..4c7e22fad60 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h +++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h @@ -188,9 +188,6 @@ typedef struct } GlyphBBox; -extern char *outputdriver; -extern char *papersize; - /* For Unicode encoding form interpretation... */ extern const UInt32 offsetsFromUTF8[6]; extern const UInt8 bytesFromUTF8[256]; diff --git a/Build/source/texk/web2c/xetexdir/appleGlyphNames.c b/Build/source/texk/web2c/xetexdir/appleGlyphNames.c index 21fe6cc6719..a036fb9c393 100644 --- a/Build/source/texk/web2c/xetexdir/appleGlyphNames.c +++ b/Build/source/texk/web2c/xetexdir/appleGlyphNames.c @@ -28,7 +28,7 @@ use or other dealings in this Software without prior written authorization from SIL International. \****************************************************************************/ -char* appleGlyphNames[] = { +const char* appleGlyphNames[] = { ".notdef", ".null", "nonmarkingreturn", diff --git a/Build/source/texk/web2c/xetexdir/xetex.ch b/Build/source/texk/web2c/xetexdir/xetex.ch index 559c9b10c60..564887f0ddc 100644 --- a/Build/source/texk/web2c/xetexdir/xetex.ch +++ b/Build/source/texk/web2c/xetexdir/xetex.ch @@ -7335,14 +7335,14 @@ token_show(def_ref); print_ln; @z @x - system(stringcast(address_of(str_pool[str_start[str_ptr]]))); + system(conststringcast(address_of(str_pool[str_start[str_ptr]]))); @y if name_of_file then libc_free(name_of_file); name_of_file := xmalloc(cur_length * 3 + 2); k := 0; for d:=0 to cur_length-1 do append_to_name(str_pool[str_start_macro(str_ptr)+d]); name_of_file[k+1] := 0; - system(name_of_file + 1); + system(conststringcast(name_of_file+1)); @z @x |