[ntpsec commit] Remove remnants of ISC implementations of standardized inet_{ntop,pton}() .
Eric S. Raymond
esr at ntpsec.org
Fri Oct 2 13:49:17 UTC 2015
Module: ntpsec
Branch: master
Commit: 171c5e44c2f8fb2fcb36a8fe5e2c3099b5d6d7f1
Changeset: http://git.ntpsec.org/ntpsec/commit/?id=171c5e44c2f8fb2fcb36a8fe5e2c3099b5d6d7f1
Author: Eric S. Raymond <esr at thyrsus.com>
Date: Fri Oct 2 07:46:22 2015 -0400
Remove remnants of ISC implementations of standardized inet_{ntop,pton}().
---
lib/isc/include/isc/platform.h.in | 10 ----------
lib/isc/unix/include/isc/net.h | 23 +----------------------
lib/isc/win32/include/isc/net.h | 14 +-------------
lib/isc/win32/libisc.def | 1 -
lib/isc/win32/libisc.dsp | 8 --------
lib/isc/win32/libisc.mak | 8 --------
ports/winnt/vs2005/libntp.vcproj | 8 --------
ports/winnt/vs2008/libntp/libntp.vcproj | 4 ----
ports/winnt/vs2013/libntp/libntp.vcxproj | 2 --
ports/winnt/vs2013/libntp/libntp.vcxproj.filters | 6 ------
10 files changed, 2 insertions(+), 82 deletions(-)
diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
index 03c2710..a64e9ae 100644
--- a/lib/isc/include/isc/platform.h.in
+++ b/lib/isc/include/isc/platform.h.in
@@ -84,16 +84,6 @@
@ISC_PLATFORM_HAVESCOPEID@
/*! \brief
- * If this system needs inet_ntop(), ISC_PLATFORM_NEEDNTOP will be defined.
- */
- at ISC_PLATFORM_NEEDNTOP@
-
-/*! \brief
- * If this system needs inet_pton(), ISC_PLATFORM_NEEDPTON will be defined.
- */
- at ISC_PLATFORM_NEEDPTON@
-
-/*! \brief
* If this system needs in_port_t, ISC_PLATFORM_NEEDPORTT will be defined.
*/
@ISC_PLATFORM_NEEDPORTT@
diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h
index 5be4c71..01a8adc 100644
--- a/lib/isc/unix/include/isc/net.h
+++ b/lib/isc/unix/include/isc/net.h
@@ -37,17 +37,9 @@
*\li struct sockaddr_in6
*\li in_port_t
*
- * It ensures that the AF_ and PF_ macros are defined.
- *
* It declares ntoh[sl]() and hton[sl]().
*
- * It declares inet_aton(), inet_ntop(), and inet_pton().
- *
- * It ensures that #INADDR_LOOPBACK, #INADDR_ANY, #IN6ADDR_ANY_INIT,
- * in6addr_any, and in6addr_loopback are available.
- *
- * It ensures that IN_MULTICAST() is available to check for multicast
- * addresses.
+ * It declares inet_aton()
*
* MP:
*\li No impact.
@@ -192,19 +184,6 @@ isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high);
* the range.
*/
-#ifdef ISC_PLATFORM_NEEDNTOP
-const char *
-isc_net_ntop(int af, const void *src, char *dst, size_t size);
-#define inet_ntop isc_net_ntop
-#endif
-
-#ifdef ISC_PLATFORM_NEEDPTON
-int
-isc_net_pton(int af, const char *src, void *dst);
-#undef inet_pton
-#define inet_pton isc_net_pton
-#endif
-
int
isc_net_aton(const char *cp, struct in_addr *addr);
#undef inet_aton
diff --git a/lib/isc/win32/include/isc/net.h b/lib/isc/win32/include/isc/net.h
index de119ee..1acac9c 100644
--- a/lib/isc/win32/include/isc/net.h
+++ b/lib/isc/win32/include/isc/net.h
@@ -50,7 +50,7 @@
*
* It declares ntoh[sl]() and hton[sl]().
*
- * It declares inet_aton(), inet_ntop(), and inet_pton().
+ * It declares inet_aton().
*
* It ensures that INADDR_ANY, IN6ADDR_ANY_INIT, in6addr_any, and
* in6addr_loopback are available.
@@ -346,18 +346,6 @@ isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high);
* the range.
*/
-#ifdef ISC_PLATFORM_NEEDNTOP
-const char *
-isc_net_ntop(int af, const void *src, char *dst, size_t size);
-#define inet_ntop isc_net_ntop
-#endif
-
-#ifdef ISC_PLATFORM_NEEDPTON
-int
-isc_net_pton(int af, const char *src, void *dst);
-#define inet_pton isc_net_pton
-#endif
-
int
isc_net_aton(const char *cp, struct in_addr *addr);
#define inet_aton isc_net_aton
diff --git a/lib/isc/win32/libisc.def b/lib/isc/win32/libisc.def
index 129503c..572193e 100644
--- a/lib/isc/win32/libisc.def
+++ b/lib/isc/win32/libisc.def
@@ -345,7 +345,6 @@ isc_net_aton
isc_net_disableipv4
isc_net_disableipv6
isc_net_getudpportrange
-isc_net_ntop
isc_net_probe_ipv6only
isc_net_probe_ipv6pktinfo
isc_net_probeipv4
diff --git a/lib/isc/win32/libisc.dsp b/lib/isc/win32/libisc.dsp
index 9e26493..ee07f83 100644
--- a/lib/isc/win32/libisc.dsp
+++ b/lib/isc/win32/libisc.dsp
@@ -611,14 +611,6 @@ SOURCE=..\inet_aton.c
# End Source File
# Begin Source File
-SOURCE=..\inet_ntop.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\inet_pton.c
-# End Source File
-# Begin Source File
-
SOURCE=..\lex.c
# End Source File
# Begin Source File
diff --git a/lib/isc/win32/libisc.mak b/lib/isc/win32/libisc.mak
index 5d795b6..de71cbd 100644
--- a/lib/isc/win32/libisc.mak
+++ b/lib/isc/win32/libisc.mak
@@ -140,8 +140,6 @@ CLEAN :
- at erase "$(INTDIR)\hmacsha.obj"
- at erase "$(INTDIR)\httpd.obj"
- at erase "$(INTDIR)\inet_aton.obj"
- - at erase "$(INTDIR)\inet_ntop.obj"
- - at erase "$(INTDIR)\inet_pton.obj"
- at erase "$(INTDIR)\interfaceiter.obj"
- at erase "$(INTDIR)\ipv6.obj"
- at erase "$(INTDIR)\iterated_hash.obj"
@@ -255,8 +253,6 @@ LINK32_OBJS= \
"$(INTDIR)\hmacsha.obj" \
"$(INTDIR)\httpd.obj" \
"$(INTDIR)\inet_aton.obj" \
- "$(INTDIR)\inet_ntop.obj" \
- "$(INTDIR)\inet_pton.obj" \
"$(INTDIR)\lex.obj" \
"$(INTDIR)\lfsr.obj" \
"$(INTDIR)\lib.obj" \
@@ -359,10 +355,6 @@ CLEAN :
- at erase "$(INTDIR)\httpd.sbr"
- at erase "$(INTDIR)\inet_aton.obj"
- at erase "$(INTDIR)\inet_aton.sbr"
- - at erase "$(INTDIR)\inet_ntop.obj"
- - at erase "$(INTDIR)\inet_ntop.sbr"
- - at erase "$(INTDIR)\inet_pton.obj"
- - at erase "$(INTDIR)\inet_pton.sbr"
- at erase "$(INTDIR)\interfaceiter.obj"
- at erase "$(INTDIR)\interfaceiter.sbr"
- at erase "$(INTDIR)\ipv6.obj"
diff --git a/ports/winnt/vs2005/libntp.vcproj b/ports/winnt/vs2005/libntp.vcproj
index 49c7992..63d7a42 100644
--- a/ports/winnt/vs2005/libntp.vcproj
+++ b/ports/winnt/vs2005/libntp.vcproj
@@ -309,14 +309,6 @@
>
</File>
<File
- RelativePath="..\..\..\lib\isc\inet_ntop.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\isc\inet_pton.c"
- >
- </File>
- <File
RelativePath="..\..\..\lib\isc\win32\interfaceiter.c"
>
</File>
diff --git a/ports/winnt/vs2008/libntp/libntp.vcproj b/ports/winnt/vs2008/libntp/libntp.vcproj
index d66dcca..d0de974 100644
--- a/ports/winnt/vs2008/libntp/libntp.vcproj
+++ b/ports/winnt/vs2008/libntp/libntp.vcproj
@@ -412,10 +412,6 @@
>
</File>
<File
- RelativePath="..\..\..\..\lib\isc\inet_ntop.c"
- >
- </File>
- <File
RelativePath="..\..\..\..\lib\isc\inet_pton.c"
>
</File>
diff --git a/ports/winnt/vs2013/libntp/libntp.vcxproj b/ports/winnt/vs2013/libntp/libntp.vcxproj
index fce53ea..618ca1a 100644
--- a/ports/winnt/vs2013/libntp/libntp.vcxproj
+++ b/ports/winnt/vs2013/libntp/libntp.vcxproj
@@ -282,8 +282,6 @@
<ClCompile Include="..\..\..\..\lib\isc\error.c" />
<ClCompile Include="..\..\..\..\lib\isc\event.c" />
<ClCompile Include="..\..\..\..\lib\isc\inet_aton.c" />
- <ClCompile Include="..\..\..\..\lib\isc\inet_ntop.c" />
- <ClCompile Include="..\..\..\..\lib\isc\inet_pton.c" />
<ClCompile Include="..\..\..\..\lib\isc\lib.c" />
<ClCompile Include="..\..\..\..\lib\isc\log.c" />
<ClCompile Include="..\..\..\..\lib\isc\md5.c" />
diff --git a/ports/winnt/vs2013/libntp/libntp.vcxproj.filters b/ports/winnt/vs2013/libntp/libntp.vcxproj.filters
index 73ea927..a1d2ee1 100644
--- a/ports/winnt/vs2013/libntp/libntp.vcxproj.filters
+++ b/ports/winnt/vs2013/libntp/libntp.vcxproj.filters
@@ -122,12 +122,6 @@
<ClCompile Include="..\..\..\..\lib\isc\inet_aton.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\lib\isc\inet_ntop.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\..\lib\isc\inet_pton.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\lib\isc\win32\interfaceiter.c">
<Filter>Source Files</Filter>
</ClCompile>
More information about the vc
mailing list