diff options
author | Jakub Jelinek <jakub@redhat.com> | 2009-02-18 15:49:44 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2009-02-18 15:49:44 +0000 |
commit | cf22c5c9b3a4a6cc81a269d49d2324b5df084d74 (patch) | |
tree | ca7e374c348baf4e6510329f3f271eca4eb5419f /resolv | |
parent | 73c5dd45bc405428148ee740cac61a1279fe57d4 (diff) |
Updated to fedora-glibc-20090218T1534
Diffstat (limited to 'resolv')
-rw-r--r-- | resolv/arpa/nameser.h | 2 | ||||
-rw-r--r-- | resolv/netdb.h | 4 | ||||
-rw-r--r-- | resolv/res_libc.c | 5 | ||||
-rw-r--r-- | resolv/resolv.h | 34 |
4 files changed, 22 insertions, 23 deletions
diff --git a/resolv/arpa/nameser.h b/resolv/arpa/nameser.h index 7979b3d4dd..6a2c8376bd 100644 --- a/resolv/arpa/nameser.h +++ b/resolv/arpa/nameser.h @@ -487,7 +487,7 @@ int ns_sprintrrf (const u_char *, size_t, const char *, char *, size_t) __THROW; int ns_format_ttl (u_long, char *, size_t) __THROW; int ns_parse_ttl (const char *, u_long *) __THROW; -u_int32_t ns_datetosecs (const char *cp, int *errp) __THROW; +u_int32_t ns_datetosecs (const char *, int *) __THROW; int ns_name_ntol (const u_char *, u_char *, size_t) __THROW; int ns_name_ntop (const u_char *, char *, size_t) __THROW; int ns_name_pton (const char *, u_char *, size_t) __THROW; diff --git a/resolv/netdb.h b/resolv/netdb.h index a260c487bc..dc1f7cec61 100644 --- a/resolv/netdb.h +++ b/resolv/netdb.h @@ -1,4 +1,4 @@ - /* Copyright (C) 1996-2002, 2003, 2004 Free Software Foundation, Inc. + /* Copyright (C) 1996-2002, 2003, 2004, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -421,7 +421,7 @@ extern int getnetgrent (char **__restrict __hostp, or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ extern int innetgr (__const char *__netgroup, __const char *__host, - __const char *__user, __const char *domain); + __const char *__user, __const char *__domain); /* Reentrant version of `getnetgrent' where result is placed in BUFFER. diff --git a/resolv/res_libc.c b/resolv/res_libc.c index 8af57f7a4a..810fbc804d 100644 --- a/resolv/res_libc.c +++ b/resolv/res_libc.c @@ -96,10 +96,9 @@ __res_maybe_init (res_state resp, int preinit) { if (resp->options & RES_INIT) { if (__res_initstamp != resp->_u._ext.initstamp) { - if (resp->nscount > 0) { + if (resp->nscount > 0) __res_iclose (resp, true); - return __res_vinit (resp, 1); - } + return __res_vinit (resp, 1); } return 0; } else if (preinit) { diff --git a/resolv/resolv.h b/resolv/resolv.h index 105631ee7d..a0de320d0f 100644 --- a/resolv/resolv.h +++ b/resolv/resolv.h @@ -71,19 +71,19 @@ typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error } res_sendhookact; -typedef res_sendhookact (*res_send_qhook) (struct sockaddr_in * const *ns, - const u_char **query, - int *querylen, - u_char *ans, - int anssiz, - int *resplen); +typedef res_sendhookact (*res_send_qhook) (struct sockaddr_in * const *__ns, + const u_char **__query, + int *__querylen, + u_char *__ans, + int __anssiz, + int *__resplen); -typedef res_sendhookact (*res_send_rhook) (const struct sockaddr_in *ns, - const u_char *query, - int querylen, - u_char *ans, - int anssiz, - int *resplen); +typedef res_sendhookact (*res_send_rhook) (const struct sockaddr_in *__ns, + const u_char *__query, + int __querylen, + u_char *__ans, + int __anssiz, + int *__resplen); /* * Global defines and variables for resolver stub. @@ -328,8 +328,8 @@ const char * sym_ntos (const struct res_sym *, int, int *) __THROW; const char * sym_ntop (const struct res_sym *, int, int *) __THROW; int b64_ntop (u_char const *, size_t, char *, size_t) __THROW; int b64_pton (char const *, u_char *, size_t) __THROW; -int loc_aton (const char *ascii, u_char *binary) __THROW; -const char * loc_ntoa (const u_char *binary, char *ascii) __THROW; +int loc_aton (const char *__ascii, u_char *__binary) __THROW; +const char * loc_ntoa (const u_char *__binary, char *__ascii) __THROW; int dn_skipname (const u_char *, const u_char *) __THROW; void putlong (u_int32_t, u_char *) __THROW; void putshort (u_int16_t, u_char *) __THROW; @@ -340,10 +340,10 @@ const char * p_rcode (int) __THROW; const u_char * p_cdnname (const u_char *, const u_char *, int, FILE *) __THROW; const u_char * p_cdname (const u_char *, const u_char *, FILE *) __THROW; -const u_char * p_fqnname (const u_char *cp, const u_char *msg, +const u_char * p_fqnname (const u_char *__cp, const u_char *__msg, int, char *, int) __THROW; const u_char * p_fqname (const u_char *, const u_char *, FILE *) __THROW; -const char * p_option (u_long option) __THROW; +const char * p_option (u_long __option) __THROW; char * p_secstodate (u_long) __THROW; int dn_count_labels (const char *) __THROW; int dn_comp (const char *, u_char *, int, u_char **, u_char **) @@ -355,7 +355,7 @@ int res_nameinquery (const char *, int, int, const u_char *, const u_char *) __THROW; int res_queriesmatch (const u_char *, const u_char *, const u_char *, const u_char *) __THROW; -const char * p_section (int section, int opcode) __THROW; +const char * p_section (int __section, int __opcode) __THROW; /* Things involving a resolver context. */ int res_ninit (res_state) __THROW; int res_nisourserver (const res_state, |