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

am 87b4286f: Merge "Expose dn_comp and dn_expand to system C code."

Browse Source 
* commit '87b4286f092094a2e8069a06e20ef5036a258172':
  Expose dn_comp and dn_expand to system C code.
This commit is contained in:
Elliott Hughes 2013-07-02 16:02:30 -07:00 committed by Android Git Automerger
commit 833dc584d4
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libc/include/resolv.h
View File

@ -43,12 +43,14 @@ struct res_state;
extern struct __res_state *__res_state(void); extern struct __res_state *__res_state(void);
#define _res (*__res_state()) #define _res (*__res_state())
/* Base-64 functions - because some code expects it there */ #define b64_ntop __b64_ntop
#define b64_pton __b64_pton
extern int b64_ntop(u_char const*, size_t, char*, size_t);
extern int b64_pton(char const*, u_char*, size_t);
#define b64_ntop __b64_ntop #define dn_comp __dn_comp
#define b64_pton __b64_pton extern int dn_comp(const char*, u_char*, int, u_char**, u_char**);
extern int b64_ntop(u_char const *, size_t, char *, size_t); extern int dn_expand(const u_char*, const u_char*, const u_char*, char*, int);
extern int b64_pton(char const *, u_char *, size_t);
__END_DECLS __END_DECLS

5
libc/private/resolv_private.h
View File

@ -345,7 +345,9 @@ extern const struct res_sym __p_type_syms[];
extern const struct res_sym __p_rcode_syms[]; extern const struct res_sym __p_rcode_syms[];
#endif /* SHARED_LIBBIND */ #endif /* SHARED_LIBBIND */
#ifndef ANDROID_CHANGES
#define dn_comp __dn_comp #define dn_comp __dn_comp
#endif
#define dn_count_labels __dn_count_labels #define dn_count_labels __dn_count_labels
#define dn_skipname __dn_skipname #define dn_skipname __dn_skipname
#define fp_resstat __fp_resstat #define fp_resstat __fp_resstat
@ -440,9 +442,6 @@ const u_char * p_fqname(const u_char *, const u_char *, FILE *);
const char * p_option(u_long); const char * p_option(u_long);
char * p_secstodate(u_long); char * p_secstodate(u_long);
int dn_count_labels(const char *); int dn_count_labels(const char *);
int dn_comp(const char *, u_char *, int, u_char **, u_char **);
int dn_expand(const u_char *, const u_char *, const u_char *,
char *, int);
u_int res_randomid(void); u_int res_randomid(void);
int res_nameinquery(const char *, int, int, const u_char *, int res_nameinquery(const char *, int, int, const u_char *,
const u_char *); const u_char *);