summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-12-10 08:24:20 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-12-10 08:24:20 +0000
commit21193f790612abde8be2f375ed4533334113e2bf (patch)
tree4c245c2e7c19e3944abd5337d0dc366fc958cfad
parentf73a2eb90adc5243a671607709a1b37911353944 (diff)
Drop unused variables (gcc 4.6 -Wunused-but-set-cariable)
git-svn-id: svn://tug.org/texlive/trunk@28488 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/afm2pl/ChangeLog4
-rw-r--r--Build/source/texk/afm2pl/afm2pl.c3
-rw-r--r--Build/source/texk/bibtexu/ChangeLog4
-rw-r--r--Build/source/texk/bibtexu/bibtex-2.c3
-rw-r--r--Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog4
-rw-r--r--Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-02-unused16
-rw-r--r--Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf.c2
-rw-r--r--Build/source/texk/dtl/ChangeLog4
-rw-r--r--Build/source/texk/dtl/dt2dv.c34
-rw-r--r--Build/source/texk/dviljk/ChangeLog5
-rw-r--r--Build/source/texk/dviljk/dvi2xx.c6
-rw-r--r--Build/source/texk/dvipos/ChangeLog4
-rw-r--r--Build/source/texk/dvipos/dvicore.c4
-rw-r--r--Build/source/texk/dvipsk/ChangeLog4
-rw-r--r--Build/source/texk/dvipsk/finclude.c3
-rw-r--r--Build/source/texk/kpathsea/ChangeLog5
-rw-r--r--Build/source/texk/kpathsea/mingw32.c2
-rw-r--r--Build/source/texk/kpathsea/win32lib.c4
-rw-r--r--Build/source/texk/makejvf/ChangeLog4
-rw-r--r--Build/source/texk/makejvf/tfmread.c6
-rw-r--r--Build/source/texk/ttf2pk/ChangeLog4
-rw-r--r--Build/source/texk/ttf2pk/subfont.c2
-rw-r--r--Build/source/texk/ttf2pk2/ChangeLog5
-rw-r--r--Build/source/texk/ttf2pk2/ftlib.c4
-rw-r--r--Build/source/texk/ttf2pk2/subfont.c2
-rw-r--r--Build/source/texk/web2c/mplibdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/mplibdir/mpxout.w2
-rw-r--r--Build/source/texk/web2c/omegafonts/ChangeLog5
-rw-r--r--Build/source/texk/web2c/omegafonts/char_routines.c38
-rw-r--r--Build/source/texk/web2c/omegafonts/ligkern_routines.c5
-rw-r--r--Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/ChangeLog4
-rw-r--r--Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/patch-06-unused28
-rw-r--r--Build/source/utils/ps2eps/ps2eps-1.68/src/C/bbox.c7
33 files changed, 151 insertions, 80 deletions
diff --git a/Build/source/texk/afm2pl/ChangeLog b/Build/source/texk/afm2pl/ChangeLog
index 72805e39e29..3a5c603bb0d 100644
--- a/Build/source/texk/afm2pl/ChangeLog
+++ b/Build/source/texk/afm2pl/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * afm2pl.c: Drop unused variable (gcc-4.6 warning).
+
2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Avoid use of deprecated INCLUDES.
diff --git a/Build/source/texk/afm2pl/afm2pl.c b/Build/source/texk/afm2pl/afm2pl.c
index b4d37c16b8d..6f7514eb30c 100644
--- a/Build/source/texk/afm2pl/afm2pl.c
+++ b/Build/source/texk/afm2pl/afm2pl.c
@@ -1346,9 +1346,6 @@ checkligkern(char *s, int isencfile)
char *mlist[5]; /* tokens constituting a ligkern spec */
int n, i, bch;
struct adobeinfo *ai;
- char *ll;
-
- ll = s;
if (s[0] == '%')
s++; /* skip optional leading `%' */
diff --git a/Build/source/texk/bibtexu/ChangeLog b/Build/source/texk/bibtexu/ChangeLog
index 1df017a2a3d..732fc5bdb93 100644
--- a/Build/source/texk/bibtexu/ChangeLog
+++ b/Build/source/texk/bibtexu/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * bibtex-2.c: Drop unused variable (gcc-4.6 warning).
+
2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Avoid use of deprecated INCLUDES.
diff --git a/Build/source/texk/bibtexu/bibtex-2.c b/Build/source/texk/bibtexu/bibtex-2.c
index dfa889a7f90..4663016cde4 100644
--- a/Build/source/texk/bibtexu/bibtex-2.c
+++ b/Build/source/texk/bibtexu/bibtex-2.c
@@ -3179,7 +3179,6 @@ This fonction is for transform UTF-8 to Unicode with ICU libs. 23/sep/2009
int32_t icu_toUChars(BufType_T buf, BufPointer_T bf_ptr,BufPointer_T len,UChar * target, int32_t tarcap)
BEGIN
- int32_t tarlen;
UConverter * ucon1;
UErrorCode err1 = U_ZERO_ERROR;
ucon1 = ucnv_open(NULL, &err1);
@@ -3187,7 +3186,7 @@ BEGIN
BEGIN
printf("1there is a error: U_ZERO_ERROR");
END
- tarlen = ucnv_toUChars(ucon1, target, tarcap, (char *)&buf[bf_ptr], len, &err1);
+ ucnv_toUChars(ucon1, target, tarcap, (char *)&buf[bf_ptr], len, &err1);
if (!U_SUCCESS(err1))
BEGIN
printf("2there is a error: U_ZERO_ERROR");
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog
index c6b678cd7d8..92c96bdf931 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-02-unused (new): Drop unused variable (gcc-4.6 warning).
+
2012-05-20 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-01-static (new): Build fix for 64-bit Mac OS X 10.7.3.
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-02-unused b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-02-unused
new file mode 100644
index 00000000000..cf4838d5781
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-02-unused
@@ -0,0 +1,16 @@
+diff -ur cjkutils-4.8.3.orig/hbf2gf/hbf.c cjkutils-4.8.3/hbf2gf/hbf.c
+--- cjkutils-4.8.3.orig/hbf2gf/hbf.c 2012-05-07 00:00:00.000000000 +0200
++++ cjkutils-4.8.3/hbf2gf/hbf.c 2012-12-07 10:57:31.000000000 +0100
+@@ -1041,12 +1041,10 @@
+ {
+ if (LocalFileName(filename) && path != NULL) {
+ #ifdef PATH_DELIMITER
+- int len;
+ char *fullname;
+ FILE *f;
+ const char *p_next;
+
+- len = strlen(filename);
+ for (;;) {
+ p_next = strchr(path, PATH_DELIMITER);
+ if (p_next == NULL)
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf.c b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf.c
index 6056555d704..1491a025727 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf.c
@@ -1041,12 +1041,10 @@ path_open(const char *path, const char *filename, char **fullp)
{
if (LocalFileName(filename) && path != NULL) {
#ifdef PATH_DELIMITER
- int len;
char *fullname;
FILE *f;
const char *p_next;
- len = strlen(filename);
for (;;) {
p_next = strchr(path, PATH_DELIMITER);
if (p_next == NULL)
diff --git a/Build/source/texk/dtl/ChangeLog b/Build/source/texk/dtl/ChangeLog
index 3b6cba183d1..d53637ba86b 100644
--- a/Build/source/texk/dtl/ChangeLog
+++ b/Build/source/texk/dtl/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * dt2dv.c: Drop unused variables (gcc-4.6 warning).
+
2012-10-17 Peter Breitenlohner <peb@mppmu.mpg.de>
* dt2dv.c, dv2dt.c, man2ps: Reduce TL/W32TeX diffs (from Akira).
diff --git a/Build/source/texk/dtl/dt2dv.c b/Build/source/texk/dtl/dt2dv.c
index a75aa1daacf..a88cedc7c00 100644
--- a/Build/source/texk/dtl/dt2dv.c
+++ b/Build/source/texk/dtl/dt2dv.c
@@ -674,7 +674,6 @@ dt2dv
{
int nprefixes = 0; /* number of prefixes in cmd_prefixes[] list. */
static Token dtl_cmd = ""; /* DTL command name */
- COUNT nread = 0; /* number of bytes read by a function from dtl file. */
nprefixes = sizeof (cmd_prefixes) / sizeof (CmdPrefix);
@@ -695,7 +694,7 @@ dt2dv
/* The very first thing should be the "variety" signature */
- nread = read_variety (dtl);
+ read_variety (dtl);
/* while not end of dtl file or reading error, */
/* read, interpret, and write commands */
@@ -710,7 +709,7 @@ dt2dv
{
/* BCOM check */
static Token token = ""; /* DTL token */
- nread = read_token (dtl, token);
+ read_token (dtl, token);
/* test for end of input, or reading error */
if (strlen (token) == 0)
{
@@ -734,7 +733,7 @@ dt2dv
}
/* read the command name */
- nread = read_token (dtl, dtl_cmd);
+ read_token (dtl, dtl_cmd);
/* test for end of input, or reading error */
if (strlen (dtl_cmd) == 0)
{
@@ -784,7 +783,7 @@ dt2dv
{
/* seek ECOM after command's last argument and optional whitespace */
static Token token = ""; /* DTL token */
- nread = read_token (dtl, token);
+ read_token (dtl, token);
/* test for end of input, or reading error */
if (strlen (token) == 0)
{
@@ -1149,12 +1148,10 @@ read_variety
/* Uniformity here enables the program easily to modify its behavior. */
{
COUNT vread = 0; /* number of DTL bytes read by read_variety */
- COUNT nread = 0; /* number of DTL bytes read by read_token */
static Token token = "";
/* read the DTL VARIETY keyword */
- nread = read_token (dtl, token);
- vread += nread;
+ vread += read_token (dtl, token);
/* test whether signature begins correctly */
if (strcmp (token, "variety") != 0)
{
@@ -1166,8 +1163,7 @@ read_variety
}
/* read the DTL variety */
- nread = read_token (dtl, token);
- vread += nread;
+ vread += read_token (dtl, token);
/* test whether variety is correct */
if (strcmp (token, VARIETY) != 0)
{
@@ -1665,7 +1661,6 @@ xfer_hex
/* return value of hexadecimal number */
{
U4 unum = 0; /* at most this space needed */
- COUNT nread = 0; /* number of DTL bytes read by read_token */
int nconv = 0; /* number of arguments converted by sscanf */
static Token token = ""; /* DTL token */
@@ -1678,7 +1673,7 @@ xfer_hex
dexit (1);
}
- nread = read_token (dtl, token);
+ read_token (dtl, token);
nconv = sscanf (token, XF4, &unum);
@@ -1711,7 +1706,6 @@ xfer_oct
/* return value of octal number */
{
U4 unum = 0; /* at most this space needed */
- COUNT nread = 0; /* number of DTL bytes read by read_token */
int nconv = 0; /* number of arguments converted by sscanf */
static Token token = ""; /* DTL token */
@@ -1724,7 +1718,7 @@ xfer_oct
dexit (1);
}
- nread = read_token (dtl, token);
+ read_token (dtl, token);
nconv = sscanf (token, OF4, &unum);
@@ -1801,11 +1795,10 @@ get_unsigned
/* return value of unsigned number */
{
U4 unum = 0; /* at most this space needed */
- COUNT nread = 0; /* number of DTL bytes read by read_token */
int nconv = 0; /* number of arguments converted by sscanf */
static Token token = ""; /* DTL token */
- nread = read_token (dtl, token);
+ read_token (dtl, token);
nconv = sscanf (token, UF4, &unum);
@@ -1834,11 +1827,10 @@ get_signed
/* return value of signed number */
{
S4 snum = 0;
- COUNT nread = 0; /* number of DTL bytes read by read_token */
int nconv = 0; /* number of sscanf arguments converted and assigned */
static Token token = "";
- nread = read_token (dtl, token);
+ read_token (dtl, token);
nconv = sscanf (token, SF4, &snum);
@@ -2316,11 +2308,10 @@ xfer_bop_address
/* return value of bop address written to DVI file */
{
S4 snum = 0; /* at most this space needed for byte address */
- COUNT nread = 0; /* number of DTL bytes read by read_token */
int nconv = 0; /* number of arguments converted by sscanf */
static Token token = ""; /* DTL token */
- nread += read_token (dtl, token);
+ read_token (dtl, token);
nconv = sscanf (token, SF4, &snum);
@@ -2365,11 +2356,10 @@ xfer_postamble_address
/* return value of postamble address written to DVI file */
{
S4 snum = 0; /* at most this space needed for byte address */
- COUNT nread = 0; /* number of DTL bytes read by read_token */
int nconv = 0; /* number of arguments converted by sscanf */
static Token token = ""; /* DTL token */
- nread += read_token (dtl, token);
+ read_token (dtl, token);
nconv = sscanf (token, SF4, &snum);
diff --git a/Build/source/texk/dviljk/ChangeLog b/Build/source/texk/dviljk/ChangeLog
index ed9cc7b7b03..bbaafc35539 100644
--- a/Build/source/texk/dviljk/ChangeLog
+++ b/Build/source/texk/dviljk/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * dvi2xx.c: Drop unused variables (gcc-4.6 warning).
+ Cast anonymous enum to ValTyp.
+
2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Avoid use of deprecated INCLUDES.
diff --git a/Build/source/texk/dviljk/dvi2xx.c b/Build/source/texk/dviljk/dvi2xx.c
index fcc11370791..c59c8d2408c 100644
--- a/Build/source/texk/dviljk/dvi2xx.c
+++ b/Build/source/texk/dviljk/dvi2xx.c
@@ -3760,7 +3760,7 @@ void DoSpecial(char *str, int n)
already about the problem. */
while ( (str = GetKeyStr(str, &k)) != NULL ) {
/* get all keyword-value pairs */
- if ( k.vt == None ) { /* no value */
+ if ( k.vt == (ValTyp) None ) { /* no value */
/* Single word might also be "comment", then ignore the rest */
if ( EQ(k.Key, "comment") )
return;
@@ -4240,9 +4240,7 @@ bool GetKeyVal(KeyWord *kw, KeyDesc tab[], int nt, int *tno)
/* compare strings, ignore case */
bool IsSame(const char *a, const char *b)
{
- const char *x, *y;
-
- for (x = a, y = b; *a; a++, b++)
+ for (; *a; a++, b++)
if ( tolower(*a) != tolower(*b) )
return( _FALSE );
diff --git a/Build/source/texk/dvipos/ChangeLog b/Build/source/texk/dvipos/ChangeLog
index bb015e2cf2c..899dcba05cb 100644
--- a/Build/source/texk/dvipos/ChangeLog
+++ b/Build/source/texk/dvipos/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * dvicore.c: Drop unused variable (gcc-4.6 warning).
+
2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Avoid use of deprecated INCLUDES.
diff --git a/Build/source/texk/dvipos/dvicore.c b/Build/source/texk/dvipos/dvicore.c
index e01226dd9b3..a0f48535d3c 100644
--- a/Build/source/texk/dvipos/dvicore.c
+++ b/Build/source/texk/dvipos/dvicore.c
@@ -1285,7 +1285,7 @@ static void find_page_location (void)
* command is being processed. */
static void define_font (SIGNED_QUAD e)
{
- SIGNED_QUAD c, q, d, m;
+ SIGNED_QUAD q, d, m;
int p, n;
char *name;
@@ -1294,7 +1294,7 @@ static void define_font (SIGNED_QUAD e)
dvi_fonts = (struct dvi_font *)realloc(dvi_fonts, max_dvi_fonts * sizeof(struct dvi_font));
}
- c = dvi_signed_quad(); /* font_check_sum */
+ dvi_signed_quad(); /* font_check_sum */
q = dvi_signed_quad(); /* font_scaled_size */
d = dvi_signed_quad(); /* font_design_size */
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index 7f981911ac2..bd36138a9a4 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * finclude.c: Drop unused variable (gcc-4.6 warning).
+
2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Avoid use of deprecated INCLUDES.
diff --git a/Build/source/texk/dvipsk/finclude.c b/Build/source/texk/dvipsk/finclude.c
index 44943924ea3..bdf62bbc17c 100644
--- a/Build/source/texk/dvipsk/finclude.c
+++ b/Build/source/texk/dvipsk/finclude.c
@@ -226,7 +226,6 @@ scan_fontnames(char *str, const char *psfile)
{
char *p,*pe;
struct resfont *re;
- int i;
/* Turn all newlines, CRs, and tabs into spaces. */
p = str;
@@ -248,7 +247,7 @@ scan_fontnames(char *str, const char *psfile)
pe = strchr(p,' ');
if(pe != NULL) *pe = '\0';
- i = add_name(p,&ps_fonts_used);
+ add_name(p,&ps_fonts_used);
if (1) {
#ifdef DEBUG
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index ffa0e1d583b..6df22070d30 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-08 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * mingw32.c (look_for_cmd): Do not compute unused value.
+ * win32lib.c (look_for_cmd, kpathsea_win32_popen): Same.
+
2012-11-28 Peter Breitenlohner <peb@mppmu.mpg.de>
* texmf.cnf: Increase main_memory, font_mem_size, hash_extra,
diff --git a/Build/source/texk/kpathsea/mingw32.c b/Build/source/texk/kpathsea/mingw32.c
index 488bc013e11..746e7452b34 100644
--- a/Build/source/texk/kpathsea/mingw32.c
+++ b/Build/source/texk/kpathsea/mingw32.c
@@ -454,7 +454,7 @@ look_for_cmd(const char *cmd, char **app)
}
/* Looking for appname on the path */
- for (s = suffixes, go_on = TRUE; go_on; *s++) {
+ for (s = suffixes, go_on = TRUE; go_on; s++) {
if (SearchPath(env_path, /* Address of search path */
app_name, /* Address of filename */
*s, /* Address of extension */
diff --git a/Build/source/texk/kpathsea/win32lib.c b/Build/source/texk/kpathsea/win32lib.c
index bff2f1e94ee..9573346bc74 100644
--- a/Build/source/texk/kpathsea/win32lib.c
+++ b/Build/source/texk/kpathsea/win32lib.c
@@ -90,7 +90,7 @@ FILE * __cdecl kpathsea_win32_popen (kpathsea kpse, const char *cmd, const char
}
/* Looking for appname on the path */
- for (s = suffixes, go_on = TRUE; go_on; *s++) {
+ for (s = suffixes, go_on = TRUE; go_on; s++) {
if (SearchPath(env_path, /* Address of search path */
app_name, /* Address of filename */
*s, /* Address of extension */
@@ -629,7 +629,7 @@ look_for_cmd(const char *cmd, char **app, char **new)
}
/* Looking for appname on the path */
- for (s = suffixes, go_on = TRUE; go_on; *s++) {
+ for (s = suffixes, go_on = TRUE; go_on; s++) {
if (SearchPath(env_path, /* Address of search path */
app_name, /* Address of filename */
*s, /* Address of extension */
diff --git a/Build/source/texk/makejvf/ChangeLog b/Build/source/texk/makejvf/ChangeLog
index 063cd545467..69d6adcfd91 100644
--- a/Build/source/texk/makejvf/ChangeLog
+++ b/Build/source/texk/makejvf/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * tfmread.c: Drop unused variable (gcc-4.6 warning).
+
2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Avoid use of deprecated INCLUDES.
diff --git a/Build/source/texk/makejvf/tfmread.c b/Build/source/texk/makejvf/tfmread.c
index f9046c0aeb4..0122e2d24c1 100644
--- a/Build/source/texk/makejvf/tfmread.c
+++ b/Build/source/texk/makejvf/tfmread.c
@@ -52,16 +52,16 @@ int tfmget(char *name)
int tfmidx(FILE *fp)
{
- int i,cc;
+ int i;
int lh,ec,nw,nh,nd,ni,nl,nk,ng,np;
jfm_id = fpair(fp);
if ((jfm_id == 9) || (jfm_id == 11)) {
nt = ufpair(fp);
- cc = fpair(fp);
+ fpair(fp);
lh = ufpair(fp);
- cc = fpair(fp);
+ fpair(fp);
ec = ufpair(fp);
nw = ufpair(fp);
nh = ufpair(fp);
diff --git a/Build/source/texk/ttf2pk/ChangeLog b/Build/source/texk/ttf2pk/ChangeLog
index 8c899495a60..e42f24feece 100644
--- a/Build/source/texk/ttf2pk/ChangeLog
+++ b/Build/source/texk/ttf2pk/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * subfont.c: Drop unused variable (gcc-4.6 warning).
+
2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Avoid use of deprecated INCLUDES.
diff --git a/Build/source/texk/ttf2pk/subfont.c b/Build/source/texk/ttf2pk/subfont.c
index 89619f11e01..e99c6138b9e 100644
--- a/Build/source/texk/ttf2pk/subfont.c
+++ b/Build/source/texk/ttf2pk/subfont.c
@@ -354,13 +354,11 @@ really_close_sfd(realsubfont *real_name)
void
handle_sfd(char *s, int *sfd_begin, int *postfix_begin)
{
- size_t len;
int i;
Boolean have_atsign;
have_atsign = False;
- len = strlen(s);
*sfd_begin = -1;
*postfix_begin = -1;
diff --git a/Build/source/texk/ttf2pk2/ChangeLog b/Build/source/texk/ttf2pk2/ChangeLog
index 120cc642990..422c195259d 100644
--- a/Build/source/texk/ttf2pk2/ChangeLog
+++ b/Build/source/texk/ttf2pk2/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * ftlib.c: Drop unused functions get_Short() and get_Long().
+ * subfont.c: Drop unused variable (gcc-4.6 warning).
+
2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Avoid use of deprecated INCLUDES.
diff --git a/Build/source/texk/ttf2pk2/ftlib.c b/Build/source/texk/ttf2pk2/ftlib.c
index 5a45d7b15ef..ffe3827b7ff 100644
--- a/Build/source/texk/ttf2pk2/ftlib.c
+++ b/Build/source/texk/ttf2pk2/ftlib.c
@@ -93,6 +93,7 @@ get_UShort(void)
return (FT_UShort) cc;
}
+#if 0 /* unised */
static FT_Short
get_Short(void)
{
@@ -101,6 +102,7 @@ get_Short(void)
cc |= get_Byte();
return (FT_Short) cc;
}
+#endif
static FT_ULong
get_ULong(void)
@@ -113,6 +115,7 @@ get_ULong(void)
return (FT_ULong) cc;
}
+#if 0 /* unised */
static FT_Long
get_Long(void)
{
@@ -123,6 +126,7 @@ get_Long(void)
cc |= get_Byte();
return (FT_Long) cc;
}
+#endif
#if 0
FT_UShort in_string[2];
diff --git a/Build/source/texk/ttf2pk2/subfont.c b/Build/source/texk/ttf2pk2/subfont.c
index 89619f11e01..e99c6138b9e 100644
--- a/Build/source/texk/ttf2pk2/subfont.c
+++ b/Build/source/texk/ttf2pk2/subfont.c
@@ -354,13 +354,11 @@ really_close_sfd(realsubfont *real_name)
void
handle_sfd(char *s, int *sfd_begin, int *postfix_begin)
{
- size_t len;
int i;
Boolean have_atsign;
have_atsign = False;
- len = strlen(s);
*sfd_begin = -1;
*postfix_begin = -1;
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index 056e1925343..c98917765c0 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * mpxout.w: Cast arg3 of spawnvp() to `const char* const*'.
+
2012-08-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* mpost.w: Reduce diffs between TeX Live and W32TeX.
diff --git a/Build/source/texk/web2c/mplibdir/mpxout.w b/Build/source/texk/web2c/mplibdir/mpxout.w
index d82cbc1022b..27c93c96620 100644
--- a/Build/source/texk/web2c/mplibdir/mpxout.w
+++ b/Build/source/texk/web2c/mplibdir/mpxout.w
@@ -3981,7 +3981,7 @@ static int do_spawn (MPX mpx, char *icmd, char **options) {
}
}
#else
- retcode = spawnvp(_P_WAIT, cmd, (const char **)options);
+ retcode = spawnvp(_P_WAIT, cmd, (const char* const*)options);
#endif
xfree(cmd);
return retcode;
diff --git a/Build/source/texk/web2c/omegafonts/ChangeLog b/Build/source/texk/web2c/omegafonts/ChangeLog
index 96ef09a02cb..6881f358db9 100644
--- a/Build/source/texk/web2c/omegafonts/ChangeLog
+++ b/Build/source/texk/web2c/omegafonts/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * char_routines.c, ligkern_routines.c:
+ Drop unused variables (gcc-4.6 warning).
+
2012-08-25 Peter Breitenlohner <peb@mppmu.mpg.de>
* omfonts.c (PROG_IS): Compare program name case insensistively.
diff --git a/Build/source/texk/web2c/omegafonts/char_routines.c b/Build/source/texk/web2c/omegafonts/char_routines.c
index 87e6d7f553e..772edb5dd9a 100644
--- a/Build/source/texk/web2c/omegafonts/char_routines.c
+++ b/Build/source/texk/web2c/omegafonts/char_routines.c
@@ -198,7 +198,6 @@ ensure_existence(unsigned c)
if (planes[plane] != NULL) { \
for (index = 0; index <=char_max[plane]; index++) { \
entry = planes[plane][index]; \
- c = plane*PLANE + index; \
if (entry != NULL) { \
FOR_ALL_CHARACTERS_ACTION \
} \
@@ -216,11 +215,12 @@ ensure_existence(unsigned c)
void
output_ovf_chars(void)
{
- register unsigned index, plane, c, k;
+ register unsigned index, plane, k;
char_entry *entry;
fix wd;
FOR_ALL_EXISTING_CHARACTERS(
+ unsigned c = plane*PLANE + index;
wd = lval(entry->indices[C_WD]);
if (design_units != UNITY)
wd = zround(((double)wd) / ((double)design_units) * 1048576.0);
@@ -243,12 +243,13 @@ output_ovf_chars(void)
void
check_existence_all_character_fields(void)
{
- register unsigned index, plane, c;
+ register unsigned index, plane;
char_entry *entry;
unsigned *exten;
unsigned j;
FOR_ALL_EXISTING_CHARACTERS(
+ unsigned c = plane*PLANE + index;
if (entry->indices[C_WD] == NULL) {
current_character = entry;
set_character_measure(C_WD, 0);
@@ -283,7 +284,7 @@ check_existence_all_character_fields(void)
void
clear_ligature_entries(void)
{
- register unsigned index, plane, c;
+ register unsigned index, plane;
char_entry *entry;
FOR_ALL_EXISTING_CHARACTERS(
@@ -334,7 +335,7 @@ doublecheck_existence(unsigned g, const_string extra, const_string fmt)
void
print_characters(boolean read_ovf)
{
- register unsigned index, plane, c;
+ register unsigned index, plane;
char_entry *entry;
four_pieces *exten;
four_entries *lentry;
@@ -342,6 +343,7 @@ print_characters(boolean read_ovf)
unsigned copies = 0;
FOR_ALL_CHARACTERS(
+ unsigned c = plane*PLANE + index;
if (copies > 0)
copies--;
else {
@@ -632,7 +634,6 @@ void
adjust_labels(boolean play_with_starts)
{
unsigned plane, index;
- unsigned c;
char_entry *entry;
int max_start = (ofm_level==OFM_TFM) ? MAX_START_TFM : MAX_START_OFM;
@@ -640,6 +641,7 @@ adjust_labels(boolean play_with_starts)
label_ptr = 0;
label_table[0].rr = -1; /* sentinel */
FOR_ALL_CHARACTERS(
+ unsigned c = plane*PLANE + index;
if ((c>=bc) && (c<=ec) && (entry->tag == TAG_LIG)) {
sort_ptr = label_ptr; /* hole at position sort_ptr+1 */
while (label_table[sort_ptr].rr > (int)(entry->remainder)) {
@@ -720,11 +722,11 @@ void
check_charlist_infinite_loops(void)
{
unsigned plane, index;
- unsigned c;
char_entry *entry;
unsigned g;
FOR_ALL_CHARACTERS(
+ unsigned c = plane*PLANE + index;
if (entry->tag == TAG_LIST) {
g = entry->remainder;
while ((g < c) && (planes[g/PLANE][g%PLANE]->tag == TAG_LIST)) {
@@ -859,11 +861,11 @@ void
compute_ofm_character_info(void)
{
unsigned plane, index;
- unsigned c;
char_entry *entry;
bc = 0x7fffffff; ec=0;
FOR_ALL_EXISTING_CHARACTERS(
+ unsigned c = plane*PLANE + index;
if (c < bc) bc = c;
if (c > ec) ec = c;
)
@@ -888,35 +890,33 @@ compute_ofm_character_info(void)
"Char (%x) too big for OFM level-1 (max ffff); use level-2",
ec);
/* Level 1 only uses plane 0. Take advantage of this fact. */
- plane=0;
num_char_info = 0;
for (index = bc; index <=ec; index++) {
unsigned saved_index = index;
char_entry *next;
- entry = planes[plane][index];
- c = plane*PLANE + index;
+ entry = planes[0][index];
if ((entry != NULL) && (WD_ENTRY != 0)) {
unsigned wd = WD_ENTRY, ht = HT_ENTRY, dp = DP_ENTRY, ic = IC_ENTRY;
index += entry->copies;
for (; index < ec; index++) {
- next = planes[plane][index+1];
+ next = planes[0][index+1];
if ((WD_NEXT != wd) || (HT_NEXT != ht) ||
(DP_NEXT != dp) || (IC_NEXT != ic) ||
(RM_NEXT != entry->remainder) || (TG_NEXT != entry->tag))
break;
- planes[plane][index+1] = entry;
+ planes[0][index+1] = entry;
}
} else {
- planes[plane][index] = NULL;
- init_character(c, NULL);
+ planes[0][index] = NULL;
+ init_character(index, NULL);
entry = current_character;
for (; index < ec; index++) {
- next = planes[plane][index+1];
+ next = planes[0][index+1];
if (WD_NEXT != 0)
break;
- planes[plane][index+1] = entry;
+ planes[0][index+1] = entry;
}
}
entry->copies = index - saved_index;
@@ -932,7 +932,6 @@ void
output_ofm_character_info(void)
{
unsigned plane, index;
- unsigned c;
char_entry *entry;
switch (ofm_level) {
@@ -940,7 +939,6 @@ output_ofm_character_info(void)
plane=0;
for (index = bc; index <=ec; index++) {
entry = planes[plane][index];
- c = plane*PLANE + index;
if (entry == NULL) {
out_ofm_4(0);
} else {
@@ -956,7 +954,6 @@ output_ofm_character_info(void)
plane=0;
for (index = bc; index <=ec; index++) {
entry = planes[plane][index];
- c = plane*PLANE + index;
if (entry == NULL) {
out_ofm_4(0); out_ofm_4(0);
} else {
@@ -975,7 +972,6 @@ output_ofm_character_info(void)
plane=0;
for (index = bc; index <=ec; index++) {
entry = planes[plane][index];
- c = plane*PLANE + index;
if (entry == NULL) {
for (i=0; i<words_per_entry; i++)
out_ofm_4(0);
diff --git a/Build/source/texk/web2c/omegafonts/ligkern_routines.c b/Build/source/texk/web2c/omegafonts/ligkern_routines.c
index 6f8fbf3d76b..5302466dfde 100644
--- a/Build/source/texk/web2c/omegafonts/ligkern_routines.c
+++ b/Build/source/texk/web2c/omegafonts/ligkern_routines.c
@@ -230,7 +230,6 @@ void
print_ligkern_table(void)
{
unsigned i;
- four_entries *entry;
sort_ptr = 1;
if (nl>0) {
@@ -240,7 +239,6 @@ print_ligkern_table(void)
print_label_command(label_table[sort_ptr].cc);
sort_ptr++;
}
- entry = lig_kern_table+i;
print_one_lig_kern_entry(lig_kern_table+i, TRUE);
}
right();
@@ -457,12 +455,11 @@ check_ligature_infinite_loops(void)
{
list entry = hash_entries.front;
hash_list tt;
- unsigned new_class;
while (entry != NULL) {
tt = (hash_list) entry->contents;
if (tt->new_class > LIG_SIMPLE)
- new_class = l_f(tt, tt->x, tt->y);
+ l_f(tt, tt->x, tt->y);
entry = entry->ptr;
}
if (y_lig_cycle != 0x80000000) {
diff --git a/Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/ChangeLog b/Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/ChangeLog
index 1136351f397..d5ec275323f 100644
--- a/Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/ChangeLog
+++ b/Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-06-unused (new): Drop unused variable (gcc-4.6 warning).
+
2012-05-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-05-write-bin (new): Use binary mode for output files.
diff --git a/Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/patch-06-unused b/Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/patch-06-unused
new file mode 100644
index 00000000000..31f6ef217bf
--- /dev/null
+++ b/Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/patch-06-unused
@@ -0,0 +1,28 @@
+diff -ur ps2eps-1.68.orig/src/C/bbox.c ps2eps-1.68/src/C/bbox.c
+--- ps2eps-1.68.orig/src/C/bbox.c 2012-06-16 18:21:11.000000000 +0200
++++ ps2eps-1.68/src/C/bbox.c 2012-12-07 10:24:48.000000000 +0100
+@@ -114,7 +114,6 @@
+ *tmpcolumnbytep;
+ unsigned int width,height; /* Image Size */
+ unsigned int byte_width;
+- unsigned char stepsize;
+ unsigned char colormax= 0; /* max color value */
+ unsigned int ui_colormax= 0; /* max color value */
+
+@@ -141,16 +140,10 @@
+ fprintf(stderr,"read:[%s]\n",inputline);
+ #endif
+ if ( strcmp(inputline,"P4\n") == 0 )
+- {
+- stepsize= 1;
+ magic_found= 4;
+- }
+ else
+ if ( strcmp(inputline,"P6\n") == 0 )
+- {
+- stepsize= 3;
+ magic_found= 6;
+- }
+ }
+ while ( !feof(inputfile) && !magic_found );
+
diff --git a/Build/source/utils/ps2eps/ps2eps-1.68/src/C/bbox.c b/Build/source/utils/ps2eps/ps2eps-1.68/src/C/bbox.c
index fcaf1f67ff6..0e5b42224c8 100644
--- a/Build/source/utils/ps2eps/ps2eps-1.68/src/C/bbox.c
+++ b/Build/source/utils/ps2eps/ps2eps-1.68/src/C/bbox.c
@@ -114,7 +114,6 @@ void readppm_and_calcbb(const char *name,
*tmpcolumnbytep;
unsigned int width,height; /* Image Size */
unsigned int byte_width;
- unsigned char stepsize;
unsigned char colormax= 0; /* max color value */
unsigned int ui_colormax= 0; /* max color value */
@@ -141,16 +140,10 @@ void readppm_and_calcbb(const char *name,
fprintf(stderr,"read:[%s]\n",inputline);
#endif
if ( strcmp(inputline,"P4\n") == 0 )
- {
- stepsize= 1;
magic_found= 4;
- }
else
if ( strcmp(inputline,"P6\n") == 0 )
- {
- stepsize= 3;
magic_found= 6;
- }
}
while ( !feof(inputfile) && !magic_found );