summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorMartin Schröder <martin@oneiros.de>2006-12-28 21:05:49 +0000
committerMartin Schröder <martin@oneiros.de>2006-12-28 21:05:49 +0000
commit8bc8353e510eb2e95fee0210edc479691b79dc0c (patch)
tree6c3329d870358c898ae94c7f6e6bd602aa0aab62 /Build
parent3875ecd0ebfa04fb8e423600add161ef71d7a71a (diff)
fixed some warnings raised by gcc for unused variables and different signedness
of arguments git-svn-id: svn://tug.org/texlive/trunk@2997 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/lib/ChangeLog4
-rw-r--r--Build/source/texk/web2c/lib/texmfmp.c14
2 files changed, 11 insertions, 7 deletions
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index 3a23ea805c4..c69c919d155 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-28 Martin Schröder <martin@oneiros.de>
+ * texmfmp.c: fixed some warnings raised by gcc for unused variables
+ and different signedness of arguments
+
2006-07-16 Karl Berry <karl@tug.org>
* mfmpi386.asm: missing " chars.
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index cf7fa725f93..9005dea6464 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -1348,8 +1348,8 @@ open_in_or_pipe P3C(FILE **, f_ptr, int, filefmt, const_string, fopen_mode)
if (shellenabledp && *(nameoffile+1) == '|') {
/* the user requested a pipe */
*f_ptr = NULL;
- fname = (string)xmalloc(strlen(nameoffile+1));
- strcpy(fname,nameoffile+1);
+ fname = (string)xmalloc(strlen((const_string)(nameoffile+1)));
+ strcpy(fname,(const_string)(nameoffile+1));
#if !defined(pdfTeX) && !defined(pdfeTeX)
if (fullnameoffile)
free (fullnameoffile);
@@ -1387,8 +1387,8 @@ open_out_or_pipe P2C(FILE **, f_ptr, const_string, fopen_mode)
if (shellenabledp && *(nameoffile+1) == '|') {
/* the user requested a pipe */
- fname = (string)xmalloc(strlen(nameoffile+1));
- strcpy(fname,nameoffile+1);
+ fname = (string)xmalloc(strlen((const_string)(nameoffile+1)));
+ strcpy(fname,(const_string)(nameoffile+1));
if (strchr (fname,' ')==NULL && strchr(fname,'>')==NULL) {
/* mp and mf currently do not use this code, but it
is better to be prepared */
@@ -1861,6 +1861,7 @@ setupboundvariable P3C(integer *, var, const_string, var_name, integer, dflt)
/* FIXME -- some (most?) of this can/should be moved to the Pascal/WEB side. */
#if defined(TeX) || defined(MP) || defined(MF)
+#if !defined(pdfTeX)
static void
checkpoolpointer (poolpointer poolptr, size_t len)
{
@@ -1871,7 +1872,6 @@ checkpoolpointer (poolpointer poolptr, size_t len)
}
}
-#if !defined(pdfTeX)
#ifndef XeTeX /* XeTeX uses this from XeTeX_mac.c */
static
#endif
@@ -1958,7 +1958,7 @@ compare_paths P2C(const_string, p1, const_string, p2)
string
gettexstring P1C(strnumber, s)
{
- poolpointer i, len;
+ poolpointer len;
string name;
#if !defined(Omega) && !defined(eOmega) && !defined(Aleph) && !defined(XeTeX)
len = strstart[s + 1] - strstart[s];
@@ -1969,6 +1969,7 @@ gettexstring P1C(strnumber, s)
#if !defined(Omega) && !defined(eOmega) && !defined(Aleph) && !defined(XeTeX)
strncpy (name, (string)&strpool[strstart[s]], len);
#else
+ poolpointer i;
/* Don't use strncpy. The strpool is not made up of chars. */
for (i=0; i<len; i++) name[i] = strpool[i+strstartar[s - 65536L]];
#endif
@@ -2005,7 +2006,6 @@ makesrcspecial P2C(strnumber, srcfilename,
char *filename = gettexstring(srcfilename);
/* FIXME: Magic number. */
char buf[40];
- size_t len = strlen(filename);
char * s = buf;
/* Always put a space after the number, which makes things easier