diff options
Diffstat (limited to 'lib/irs')
| -rw-r--r-- | lib/irs/Makefile.in | 2 | ||||
| -rw-r--r-- | lib/irs/api | 2 | ||||
| -rw-r--r-- | lib/irs/context.c | 4 | ||||
| -rw-r--r-- | lib/irs/getaddrinfo.c | 16 | ||||
| -rw-r--r-- | lib/irs/include/irs/Makefile.in | 4 |
5 files changed, 16 insertions, 12 deletions
diff --git a/lib/irs/Makefile.in b/lib/irs/Makefile.in index c59af263fe4b4..ba802bf478331 100644 --- a/lib/irs/Makefile.in +++ b/lib/irs/Makefile.in @@ -74,7 +74,7 @@ installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} install:: timestamp installdirs - ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libirs.@A@ ${DESTDIR}${libdir} + ${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libirs.@A@ ${DESTDIR}${libdir} clean distclean:: rm -f libirs.@A@ libirs.la timestamp diff --git a/lib/irs/api b/lib/irs/api index 3f5a2a3b16935..c20ad07b828f0 100644 --- a/lib/irs/api +++ b/lib/irs/api @@ -5,5 +5,5 @@ # 9.9: 90-109 # 9.9-sub: 130-139 LIBINTERFACE = 91 -LIBREVISION = 0 +LIBREVISION = 1 LIBAGE = 0 diff --git a/lib/irs/context.c b/lib/irs/context.c index be69622b5b6ae..b01087d198081 100644 --- a/lib/irs/context.c +++ b/lib/irs/context.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009, 2014 Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -148,7 +148,7 @@ thread_key_mutex_init(void) { } static isc_result_t -thread_key_init() { +thread_key_init(void) { isc_result_t result; result = isc_once_do(&once, thread_key_mutex_init); diff --git a/lib/irs/getaddrinfo.c b/lib/irs/getaddrinfo.c index 24d35bf691d9d..f821635e984ea 100644 --- a/lib/irs/getaddrinfo.c +++ b/lib/irs/getaddrinfo.c @@ -178,6 +178,7 @@ static int add_ipv6(const char *hostname, int flags, struct addrinfo **aip, int socktype, int port); static void set_order(int, int (**)(const char *, int, struct addrinfo **, int, int)); +static void _freeaddrinfo(struct addrinfo *ai); #define FOUND_IPV4 0x1 #define FOUND_IPV6 0x2 @@ -339,7 +340,7 @@ getaddrinfo(const char *hostname, const char *servname, if (family == AF_INET6 || family == 0) { ai = ai_alloc(AF_INET6, sizeof(struct sockaddr_in6)); if (ai == NULL) { - freeaddrinfo(ai_list); + _freeaddrinfo(ai_list); return (EAI_MEMORY); } ai->ai_socktype = socktype; @@ -458,7 +459,7 @@ getaddrinfo(const char *hostname, const char *servname, NI_NUMERICHOST) == 0) { ai->ai_canonname = strdup(nbuf); if (ai->ai_canonname == NULL) { - freeaddrinfo(ai); + _freeaddrinfo(ai); return (EAI_MEMORY); } } else { @@ -481,7 +482,7 @@ getaddrinfo(const char *hostname, const char *servname, socktype, port); if (err != 0) { if (ai_list != NULL) { - freeaddrinfo(ai_list); + _freeaddrinfo(ai_list); ai_list = NULL; } break; @@ -831,7 +832,7 @@ process_answer(isc_task_t *task, isc_event_t *event) { error = EAI_NONAME; } else { if (trans->ai_sentinel.ai_next != NULL) { - freeaddrinfo(trans->ai_sentinel.ai_next); + _freeaddrinfo(trans->ai_sentinel.ai_next); trans->ai_sentinel.ai_next = NULL; } } @@ -1123,7 +1124,7 @@ add_ipv4(const char *hostname, int flags, struct addrinfo **aip, ai = ai_clone(*aip, AF_INET); /* don't use ai_clone() */ if (ai == NULL) { - freeaddrinfo(*aip); + _freeaddrinfo(*aip); return (EAI_MEMORY); } @@ -1161,6 +1162,11 @@ add_ipv6(const char *hostname, int flags, struct addrinfo **aip, /*% Free address info. */ void freeaddrinfo(struct addrinfo *ai) { + _freeaddrinfo(ai); +} + +static void +_freeaddrinfo(struct addrinfo *ai) { struct addrinfo *ai_next; while (ai != NULL) { diff --git a/lib/irs/include/irs/Makefile.in b/lib/irs/include/irs/Makefile.in index eca98eb136719..2a47975516748 100644 --- a/lib/irs/include/irs/Makefile.in +++ b/lib/irs/include/irs/Makefile.in @@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@ # machine generated. The latter are handled specially in the # install target below. # -HEADERS = version.h +HEADERS = context.h dnsconf.h resconf.h types.h version.h SUBDIRS = TARGETS = @@ -39,8 +39,6 @@ install:: installdirs done ${INSTALL_DATA} netdb.h ${DESTDIR}${includedir}/irs ${INSTALL_DATA} platform.h ${DESTDIR}${includedir}/irs - ${INSTALL_DATA} resconf.h ${DESTDIR}${includedir}/irs - ${INSTALL_DATA} types.h ${DESTDIR}${includedir}/irs distclean:: rm -f netdb.h platform.h |