am 253fcfe7: am 398ef152: Merge "Move endpwent to ndk_cruft.cpp."

* commit '253fcfe70e1bb87ca66e2886d90f6906e8d27f12':
  Move endpwent to ndk_cruft.cpp.
This commit is contained in:
Yabin Cui 2015-02-26 02:58:56 +00:00 committed by Android Git Automerger
commit 0a2db6e26f
3 changed files with 3 additions and 16 deletions

View File

@ -358,3 +358,6 @@ extern "C" void setusershell() { }
// This is never implemented in bionic, only needed for ABI compatibility with the NDK. // This is never implemented in bionic, only needed for ABI compatibility with the NDK.
extern "C" void endusershell() { } extern "C" void endusershell() { }
// This is never implemented in bionic, only needed for ABI compatibility with the NDK.
extern "C" void endpwent() { }

View File

@ -446,18 +446,6 @@ protoent* getprotobynumber(int /*proto*/) {
return NULL; return NULL;
} }
static void unimplemented_stub(const char* function) {
const char* fmt = "%s(3) is not implemented on Android\n";
__libc_format_log(ANDROID_LOG_WARN, "libc", fmt, function);
fprintf(stderr, fmt, function);
}
#define UNIMPLEMENTED unimplemented_stub(__PRETTY_FUNCTION__)
void endpwent() {
UNIMPLEMENTED;
}
// Portable code should use sysconf(_SC_PAGE_SIZE) directly instead. // Portable code should use sysconf(_SC_PAGE_SIZE) directly instead.
int getpagesize() { int getpagesize() {
// We dont use sysconf(3) here because that drags in stdio, which makes static binaries fat. // We dont use sysconf(3) here because that drags in stdio, which makes static binaries fat.

View File

@ -119,10 +119,6 @@ struct passwd* getpwuid(uid_t);
int getpwnam_r(const char*, struct passwd*, char*, size_t, struct passwd**); int getpwnam_r(const char*, struct passwd*, char*, size_t, struct passwd**);
int getpwuid_r(uid_t, struct passwd*, char*, size_t, struct passwd**); int getpwuid_r(uid_t, struct passwd*, char*, size_t, struct passwd**);
void endpwent(void);
struct passwd* getpwent(void);
int setpwent(void);
__END_DECLS __END_DECLS
#endif #endif