generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removes getdtablesize(3) from LP64.

Browse Source 
getdtablesize(3) was removed fro POSIX 2004. Keep the symbol around in LP32 for
binary compatibility, but remove the declaration from unistd.h.

Bug: 13935372
Change-Id: I1f96cd290bf9176f922dad58bd5a7ab2cae7ef0f
This commit is contained in:
Dan Albert 2014-06-13 16:51:24 -07:00
parent 72dc1c22dc
commit 462abab12b
4 changed files with 11 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libc/Android.mk
View File

@ -45,7 +45,6 @@ libc_common_src_files := \
bionic/ether_ntoa.c \ bionic/ether_ntoa.c \
bionic/ftime.c \ bionic/ftime.c \
bionic/fts.c \ bionic/fts.c \
bionic/getdtablesize.c \
bionic/gethostname.c \ bionic/gethostname.c \
bionic/getpriority.c \ bionic/getpriority.c \
bionic/getpt.c \ bionic/getpt.c \

39
libc/bionic/getdtablesize.c
View File

@ -1,39 +0,0 @@
/*
* Copyright (C) 2008 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <sys/resource.h>
#include <sys/sysconf.h>
int getdtablesize()
{
struct rlimit r;
if (getrlimit(RLIMIT_NOFILE, &r) < 0) {
return sysconf(_SC_OPEN_MAX);
}
return r.rlim_cur;
}

11
libc/bionic/ndk_cruft.cpp
View File

@ -255,4 +255,15 @@ extern "C" pid_t wait3(int* status, int options, struct rusage* rusage) {
return wait4(-1, status, options, rusage); return wait4(-1, status, options, rusage);
} }
// This was removed from POSIX 2004.
extern "C" int getdtablesize() {
struct rlimit r;
if (getrlimit(RLIMIT_NOFILE, &r) < 0) {
return sysconf(_SC_OPEN_MAX);
}
return r.rlim_cur;
}
#endif #endif

2
libc/include/unistd.h
View File

@ -164,8 +164,6 @@ extern int usleep(useconds_t);
extern int gethostname(char *, size_t); extern int gethostname(char *, size_t);
extern int getdtablesize(void);
extern void *__brk(void *); extern void *__brk(void *);
extern int brk(void *); extern int brk(void *);
extern void *sbrk(ptrdiff_t); extern void *sbrk(ptrdiff_t);