From f7cc34f8acc640d74638557768eadeb31507f9f2 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 18 Feb 2010 07:33:55 +0000 Subject: minor kpathsea cleanup git-svn-id: svn://tug.org/texlive/trunk@17083 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/ChangeLog | 5 +++++ Build/source/texk/kpathsea/absolute.c | 5 +++-- Build/source/texk/kpathsea/truncate.c | 10 +--------- Build/source/texk/kpathsea/truncate.h | 4 ---- 4 files changed, 9 insertions(+), 15 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 3389509816f..acc1c3f3373 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,8 @@ +2010-02-18 Peter Breitenlohner + + * absolute.c (kpathsea_absolute_p): Unused param. + * truncate.[ch] (kpse_truncate_filename): Removed. + 2010-02-15 Karl Berry * tex-make.c [DJGPP]: change conditionals to __DJGPP__ for diff --git a/Build/source/texk/kpathsea/absolute.c b/Build/source/texk/kpathsea/absolute.c index 01f9f0eca08..0ff3aaa3c88 100644 --- a/Build/source/texk/kpathsea/absolute.c +++ b/Build/source/texk/kpathsea/absolute.c @@ -1,6 +1,6 @@ /* absolute.c: test if a filename is absolute or explicitly relative. - Copyright 1993, 1994, 1995, 2008, 2009 Karl Berry. + Copyright 1993, 1994, 1995, 2008, 2009, 2010 Karl Berry. Copyright 1997, 2002, 2005 Olaf Weber. This library is free software; you can redistribute it and/or @@ -27,9 +27,9 @@ boolean kpathsea_absolute_p (kpathsea kpse, const_string filename, boolean relative_ok) { -/* (void)kpse; */ /* currenty not used */ #ifdef VMS #include + (void)kpse; /* currenty not used */ return strcspn (filename, "]>:") != strlen (filename); #else /* not VMS */ boolean absolute = IS_DIR_SEP (*filename) @@ -53,6 +53,7 @@ kpathsea_absolute_p (kpathsea kpse, const_string filename, boolean relative_ok) && (*filename == '.' && (IS_DIR_SEP (filename[1]) || (filename[1] == '.' && IS_DIR_SEP (filename[2])))); + (void)kpse; /* currenty not used */ /* FIXME: On UNIX an IS_DIR_SEP of any but the last character in the name implies relative. */ return absolute || explicit_relative; diff --git a/Build/source/texk/kpathsea/truncate.c b/Build/source/texk/kpathsea/truncate.c index 081ebdfff83..48662c80e44 100644 --- a/Build/source/texk/kpathsea/truncate.c +++ b/Build/source/texk/kpathsea/truncate.c @@ -1,6 +1,6 @@ /* truncate.c: truncate too-long components in a filename. - Copyright 1993, 1995, 2008 Karl Berry. + Copyright 1993, 1995, 2008, 2010 Karl Berry. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -56,11 +56,3 @@ kpathsea_truncate_filename (kpathsea kpse, const_string name) return ret; } - -#if defined (KPSE_COMPAT_API) -string -kpse_truncate_filename (const_string name) -{ - return kpathsea_truncate_filename (kpse_def, name); -} -#endif diff --git a/Build/source/texk/kpathsea/truncate.h b/Build/source/texk/kpathsea/truncate.h index 824daa16ec3..030d5977463 100644 --- a/Build/source/texk/kpathsea/truncate.h +++ b/Build/source/texk/kpathsea/truncate.h @@ -28,10 +28,6 @@ NAME. */ extern string kpathsea_truncate_filename (kpathsea kpse, const_string name); -#if defined (KPSE_COMPAT_API) -extern string kpse_truncate_filename (const_string name); -#endif - #endif /* MAKE_KPSE_DLL */ #endif /* not KPATHSEA_TRUNCATE_H */ -- cgit v1.2.3