From f81b8f57970fd69c8522f152845efab1fd241b14 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 3 Mar 2011 07:20:48 +0000 Subject: Change xftell() return type from unsigned to signed git-svn-id: svn://tug.org/texlive/trunk@21594 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/ChangeLog | 5 +++++ Build/source/texk/kpathsea/lib.h | 4 ++-- Build/source/texk/kpathsea/xftell.c | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 780ad2adfe3..7eb1b1894f6 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,8 @@ +2011-03-03 Peter Breitenlohner + + * lib.h, xftell.c (xftell): Change return type from unsigned to + signed and use ftell() instead of ftello(). + 2011-03-01 Karl Berry * texmf.cnf: be more explicit that all trees, including TEXMFHOME, diff --git a/Build/source/texk/kpathsea/lib.h b/Build/source/texk/kpathsea/lib.h index c6cafef7187..d4ded1e55fe 100644 --- a/Build/source/texk/kpathsea/lib.h +++ b/Build/source/texk/kpathsea/lib.h @@ -1,6 +1,6 @@ /* lib.h: declarations for common, low-level routines in kpathsea. - Copyright 1992, 1993, 1994, 1995, 1996, 2008, 2009, 2010 Karl Berry. + Copyright 1992, 1993, 1994, 1995, 1996, 2008, 2009, 2010, 2011 Karl Berry. Copyright 1999, 2000, 2003, 2005 Olaf Weber. This library is free software; you can redistribute it and/or @@ -205,7 +205,7 @@ extern KPSEDLL FILE *xfopen (const_string filename, const_string mode); extern KPSEDLL void xfclose (FILE *fp, const_string filename); extern KPSEDLL void xfseek (FILE *fp, long offset, int wherefrom, const_string filename); extern KPSEDLL void xfseeko (FILE *fp, off_t offset, int wherefrom, const_string filename); -extern KPSEDLL unsigned long xftell (FILE *fp, const_string filename); +extern KPSEDLL long xftell (FILE *fp, const_string filename); extern KPSEDLL off_t xftello (FILE *fp, const_string filename); /* These call the corresponding function in the standard library, and diff --git a/Build/source/texk/kpathsea/xftell.c b/Build/source/texk/kpathsea/xftell.c index 05bdc048ae6..96d8084f181 100644 --- a/Build/source/texk/kpathsea/xftell.c +++ b/Build/source/texk/kpathsea/xftell.c @@ -1,6 +1,6 @@ /* xftell.c: ftell with error checking. - Copyright 1992, 1993, 1995, 2008 Karl Berry. + Copyright 1992, 1993, 1995, 2008, 2011 Karl Berry. Copyright 2005 Olaf Weber. This library is free software; you can redistribute it and/or @@ -19,10 +19,10 @@ #include -unsigned long +long xftell (FILE *f, const_string filename) { - long where = ftello (f); + long where = ftell (f); if (where < 0) FATAL_PERROR(filename); -- cgit v1.2.3