INN commit: trunk (4 files)

INN Commit rra at isc.org
Sat Aug 30 11:55:13 UTC 2014


    Date: Saturday, August 30, 2014 @ 04:55:13
  Author: iulius
Revision: 9660

Do not hide functions from libinn

Random internal utility functions are supposed to be exposed.
Fix getrra-c-util to remove the visibility stuff when synchronizing
from upstream.

Modified:
  trunk/include/portable/getaddrinfo.h
  trunk/include/portable/getnameinfo.h
  trunk/include/portable/socket.h
  trunk/support/getrra-c-util

--------------------------------+
 include/portable/getaddrinfo.h |    6 ------
 include/portable/getnameinfo.h |    6 ------
 include/portable/socket.h      |    6 ------
 support/getrra-c-util          |   11 ++++++++++-
 4 files changed, 10 insertions(+), 19 deletions(-)

Modified: include/portable/getaddrinfo.h
===================================================================
--- include/portable/getaddrinfo.h	2014-08-30 08:08:11 UTC (rev 9659)
+++ include/portable/getaddrinfo.h	2014-08-30 11:55:13 UTC (rev 9660)
@@ -71,18 +71,12 @@
 
 BEGIN_DECLS
 
-/* Default to a hidden visibility for all portability functions. */
-#pragma GCC visibility push(hidden)
-
 /* Function prototypes. */
 int getaddrinfo(const char *nodename, const char *servname,
                 const struct addrinfo *hints, struct addrinfo **res);
 void freeaddrinfo(struct addrinfo *ai);
 const char *gai_strerror(int ecode);
 
-/* Undo default visibility change. */
-#pragma GCC visibility pop
-
 END_DECLS
 
 #endif /* !HAVE_GETADDRINFO */

Modified: include/portable/getnameinfo.h
===================================================================
--- include/portable/getnameinfo.h	2014-08-30 08:08:11 UTC (rev 9659)
+++ include/portable/getnameinfo.h	2014-08-30 11:55:13 UTC (rev 9660)
@@ -56,17 +56,11 @@
 
 BEGIN_DECLS
 
-/* Default to a hidden visibility for all portability functions. */
-#pragma GCC visibility push(hidden)
-
 /* Function prototypes. */
 int getnameinfo(const struct sockaddr *sa, socklen_t salen,
                 char *node, socklen_t nodelen,
                 char *service, socklen_t servicelen, int flags);
 
-/* Undo default visibility change. */
-#pragma GCC visibility pop
-
 END_DECLS
 
 #endif /* !HAVE_GETNAMEINFO */

Modified: include/portable/socket.h
===================================================================
--- include/portable/socket.h	2014-08-30 08:08:11 UTC (rev 9659)
+++ include/portable/socket.h	2014-08-30 11:55:13 UTC (rev 9660)
@@ -212,9 +212,6 @@
 extern const char *inet_ntoa(const struct in_addr);
 #endif
 
-/* Default to a hidden visibility for all portability functions. */
-#pragma GCC visibility push(hidden)
-
 #if !HAVE_INET_NTOP
 # ifdef _WIN32
 extern const char *inet_ntop(int, const void *, char *, int);
@@ -271,9 +268,6 @@
 typedef int socket_type;
 #endif
 
-/* Undo default visibility change. */
-#pragma GCC visibility pop
-
 END_DECLS
 
 #endif /* !PORTABLE_SOCKET_H */

Modified: support/getrra-c-util
===================================================================
--- support/getrra-c-util	2014-08-30 08:08:11 UTC (rev 9659)
+++ support/getrra-c-util	2014-08-30 11:55:13 UTC (rev 9660)
@@ -47,7 +47,10 @@
     elif [ "$2" = "include/inn" ] || [ "$2" = "include/portable" ] \
       || [ "$2" = "lib" ]
     then
-      sed -i -e 's/<config\.h>/"config.h"/g' \
+      sed -i -e 's/UTIL_/INN_/g' \
+             -e '/^\/\* Default to a hidden visibility for all .* functions\. \*\/$/,+2d' \
+             -e '/^\/\* Undo default visibility change\. \*\/$/,+2d' \
+             -e 's/<config\.h>/"config.h"/g' \
              -e 's/<portable\/system\.h>/"clibrary.h"/g' \
              -e 's/<portable\/socket\.h>/"portable\/socket.h"/g' \
              -e 's/<sys\/time\.h>/"portable\/time.h"/g' \
@@ -93,3 +96,9 @@
 download portable/socket.h include/portable socket.h
 download portable/strlcat.c lib strlcat.c
 download portable/strlcpy.c lib strlcpy.c
+
+# Synchronize utility functions from upstream.
+download util/buffer.c lib buffer.c
+download util/buffer.h include/inn buffer.h
+download util/fdflag.c lib fdflag.c
+download util/fdflag.h include/inn fdflag.h



More information about the inn-committers mailing list