From 21be7b150ce65f2bc6b4e142d77f9af0944fa3c3 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Sun, 26 Feb 2006 13:24:42 +0000 Subject: Use _lfs_64, reorganize a bit, why did stat*fs64 use stat*fs? --- libc/misc/file/lockf64.c | 22 +++++----------------- libc/misc/glob/glob64.c | 18 +----------------- libc/misc/statfs/fstatfs64.c | 18 ++---------------- libc/misc/statfs/fstatvfs64.c | 15 ++------------- libc/misc/statfs/statfs64.c | 17 ++--------------- libc/misc/statfs/statvfs64.c | 17 ++--------------- 6 files changed, 14 insertions(+), 93 deletions(-) (limited to 'libc') diff --git a/libc/misc/file/lockf64.c b/libc/misc/file/lockf64.c index 6c081ae1e..3b46a1ebe 100644 --- a/libc/misc/file/lockf64.c +++ b/libc/misc/file/lockf64.c @@ -16,20 +16,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include - -#ifdef __UCLIBC_HAS_LFS__ -#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 -#undef _FILE_OFFSET_BITS -#define _FILE_OFFSET_BITS 64 -#endif -#ifndef __USE_FILE_OFFSET64 -# define __USE_FILE_OFFSET64 1 -#endif -#ifndef __USE_LARGEFILE64 -# define __USE_LARGEFILE64 1 -#endif -#endif +#include <_lfs_64.h> #include #include @@ -43,16 +30,17 @@ #define fcntl fcntl64 #define F_GETLK F_GETLK64 #define F_SETLK F_SETLK64 +libc_hidden_proto(fcntl64) +#else +libc_hidden_proto(fcntl) #endif -libc_hidden_proto(lockf64) - libc_hidden_proto(memset) -libc_hidden_proto(fcntl64) libc_hidden_proto(getpid) /* lockf is a simplified interface to fcntl's locking facilities. */ +libc_hidden_proto(lockf64) int lockf64 (int fd, int cmd, off64_t len64) { struct flock fl; diff --git a/libc/misc/glob/glob64.c b/libc/misc/glob/glob64.c index 927ab6390..d84f874d5 100644 --- a/libc/misc/glob/glob64.c +++ b/libc/misc/glob/glob64.c @@ -4,22 +4,8 @@ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ -#include +#include <_lfs_64.h> -#ifdef __UCLIBC_HAS_LFS__ - -#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 -#undef _FILE_OFFSET_BITS -#define _FILE_OFFSET_BITS 64 -#endif -#ifndef __USE_LARGEFILE64 -# define __USE_LARGEFILE64 1 -#endif -/* We absolutely do _NOT_ want interfaces silently - * renamed under us or very bad things will happen... */ -#ifdef __USE_FILE_OFFSET64 -# undef __USE_FILE_OFFSET64 -#endif #include #include #include @@ -38,5 +24,3 @@ #define __GLOB64 1 #include "glob.c" - -#endif diff --git a/libc/misc/statfs/fstatfs64.c b/libc/misc/statfs/fstatfs64.c index 291b8719d..dd271e7a3 100644 --- a/libc/misc/statfs/fstatfs64.c +++ b/libc/misc/statfs/fstatfs64.c @@ -17,20 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include - -#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 -#undef _FILE_OFFSET_BITS -#define _FILE_OFFSET_BITS 64 -#endif -#ifndef __USE_LARGEFILE64 -# define __USE_LARGEFILE64 1 -#endif -/* We absolutely do _NOT_ want interfaces silently - * renamed under us or very bad things will happen... */ -#ifdef __USE_FILE_OFFSET64 -# undef __USE_FILE_OFFSET64 -#endif +#include <_lfs_64.h> #include #include @@ -38,12 +25,11 @@ #include #include -libc_hidden_proto(fstatfs64) - libc_hidden_proto(memcpy) libc_hidden_proto(fstatfs) /* Return information about the filesystem on which FD resides. */ +libc_hidden_proto(fstatfs64) int fstatfs64 (int fd, struct statfs64 *buf) { struct statfs buf32; diff --git a/libc/misc/statfs/fstatvfs64.c b/libc/misc/statfs/fstatvfs64.c index 13e7b40a7..a37642e70 100644 --- a/libc/misc/statfs/fstatvfs64.c +++ b/libc/misc/statfs/fstatvfs64.c @@ -17,18 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include - -#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 -#undef _FILE_OFFSET_BITS -#define _FILE_OFFSET_BITS 64 -#endif -#ifndef __USE_FILE_OFFSET64 -# define __USE_FILE_OFFSET64 1 -#endif -#ifndef __USE_LARGEFILE64 -# define __USE_LARGEFILE64 1 -#endif +#include <_lfs_64.h> #include #include @@ -52,7 +41,7 @@ libc_hidden_proto(fstatfs64) libc_hidden_proto(fstat64) libc_hidden_proto(stat64) -int fstatvfs (int fd, struct statvfs *buf) +int fstatvfs64 (int fd, struct statvfs64 *buf) { struct statfs64 fsbuf; struct stat64 st; diff --git a/libc/misc/statfs/statfs64.c b/libc/misc/statfs/statfs64.c index e8d2c13d7..8574c17af 100644 --- a/libc/misc/statfs/statfs64.c +++ b/libc/misc/statfs/statfs64.c @@ -17,31 +17,18 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include - -#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 -#undef _FILE_OFFSET_BITS -#define _FILE_OFFSET_BITS 64 -#endif -#ifndef __USE_LARGEFILE64 -# define __USE_LARGEFILE64 1 -#endif -/* We absolutely do _NOT_ want interfaces silently - * renamed under us or very bad things will happen... */ -#ifdef __USE_FILE_OFFSET64 -# undef __USE_FILE_OFFSET64 -#endif +#include <_lfs_64.h> #include #include #include -libc_hidden_proto(statfs64) libc_hidden_proto(memcpy) libc_hidden_proto(statfs) /* Return information about the filesystem on which FILE resides. */ +libc_hidden_proto(statfs64) int statfs64 (const char *file, struct statfs64 *buf) { struct statfs buf32; diff --git a/libc/misc/statfs/statvfs64.c b/libc/misc/statfs/statvfs64.c index 1a3dd2833..4a71989ec 100644 --- a/libc/misc/statfs/statvfs64.c +++ b/libc/misc/statfs/statvfs64.c @@ -17,20 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include - -#ifdef __UCLIBC_HAS_LFS__ -#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 -#undef _FILE_OFFSET_BITS -#define _FILE_OFFSET_BITS 64 -#endif -#ifndef __USE_FILE_OFFSET64 -# define __USE_FILE_OFFSET64 1 -#endif -#ifndef __USE_LARGEFILE64 -# define __USE_LARGEFILE64 1 -#endif -#endif +#include <_lfs_64.h> #include #include @@ -53,7 +40,7 @@ libc_hidden_proto(endmntent) libc_hidden_proto(statfs64) libc_hidden_proto(stat64) -int statvfs (const char *file, struct statvfs *buf) +int statvfs64 (const char *file, struct statvfs64 *buf) { struct statfs64 fsbuf; struct stat64 st; -- cgit v1.2.3