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

libc: remove private declarations from <time.h> and <resolv.h>

Browse Source 
This patch is used to remove private C library declarations from the
public headers (that are exported to the NDK). It should *only* be
submitted after all other patches modifying the users of said
private functions have been submitted to the tree, to avoid
breakages.

Change-Id: I0a5e3014f8e3ac9ed8df86a5cdae506337c23252
This commit is contained in:
David 'Digit' Turner 2012-01-13 14:24:08 +01:00
parent 11f3d5a431
commit 208898ee77
4 changed files with 2 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libc/include/resolv.h
View File

@ -50,33 +50,6 @@ extern struct __res_state *__res_state(void);
extern int b64_ntop(u_char const *, size_t, char *, size_t);
extern int b64_pton(char const *, u_char *, size_t);
/* The following declarations should *not* be part of the public C library
* headers, and are also in bionic/libc/private/resolv_iface.h
*
* Use a guard macro to prevent duplication until we modify system/netd
* to use the proper header.
*/
#ifndef _BIONIC_RESOLV_IFACE_FUNCTIONS_DECLARED
#define _BIONIC_RESOLV_IFACE_FUNCTIONS_DECLARED
/* Set name of default interface */
extern void _resolv_set_default_iface(const char* ifname);
/* set name servers for an interface */
extern void _resolv_set_nameservers_for_iface(const char* ifname, char** servers, int numservers);
/* tell resolver of the address of an interface */
extern void _resolv_set_addr_of_iface(const char* ifname, struct in_addr* addr);
/* flush the cache associated with the default interface */
extern void _resolv_flush_cache_for_default_iface();
/* flush the cache associated with a certain interface */
extern void _resolv_flush_cache_for_iface(const char* ifname);
#endif /* _BIONIC_RESOLV_IFACE_FUNCTIONS_DECLARED */
__END_DECLS
#endif /* _RESOLV_H_ */

29
libc/include/time.h
View File

@ -79,35 +79,6 @@ extern struct tm* gmtime_r(const time_t *timep, struct tm *result);
extern char* strptime(const char *buf, const char *fmt, struct tm *tm);
extern size_t strftime(char *s, size_t max, const char *format, const struct tm *tm);
/* The following declarations should not be part of the C library's public
* headers. They are duplicated under bionic/libc/private/bionic_time.h and
* will be removed from here when we modify system/libcutils to use the
* proper header instead.
*
* Use a guard macro to avoid compilation error when both headers are
* included.
*/
#ifndef _BIONIC_STRFTIME_TZ_DECLARED
#define _BIONIC_STRFTIME_TZ_DECLARED
struct strftime_locale {
const char * mon[12];
const char * month[12];
const char * standalone_month[12];
const char * wday[7];
const char * weekday[7];
const char * X_fmt;
const char * x_fmt;
const char * c_fmt;
const char * am;
const char * pm;
const char * date_fmt;
};
extern size_t strftime_tz(char *s, size_t max, const char *format, const struct tm *tm, const struct strftime_locale* lc);
#endif /* _BIONIC_STRFTIME_TZ_DECLARED */
extern char *ctime(const time_t *timep);
extern char *ctime_r(const time_t *timep, char *buf);

1
libc/netbsd/resolv/res_cache.c
View File

@ -42,6 +42,7 @@
#include <arpa/inet.h>
#include "resolv_private.h"
#include "resolv_iface.h"
/* This code implements a small and *simple* DNS resolver cache.
*

1
libc/tzcode/strftime.c
View File

@ -38,6 +38,7 @@ static const char sccsid[] = "@(#)strftime.c 5.4 (Berkeley) 3/14/89";
#include "locale.h"
#include <ctype.h>
#include <time64.h>
#include <bionic_time.h> /* for strftime_tz */
/* struct lc_time_T is now defined as strftime_locale
* in <time.h>