From: Ken Raeburn <raeburn@mit.edu>
Date: Fri, 16 Jul 2004 20:50:40 +0000 (+0000)
Subject: * port-sockets.h (inet_ntop): Cast NULL to desired return pointer type
X-Git-Tag: krb5-1.4-beta1~203
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9eba02b742394ef8c4912be5ed7cb557504ff2f9;p=krb5.git

* port-sockets.h (inet_ntop): Cast NULL to desired return pointer type

ticket: 2592
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16604 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 88178298a..7f05b0638 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* port-sockets.h (inet_ntop): Cast NULL to desired return pointer
+	type.
+
 2004-07-15  Alexandra Ellwood  <lxs@mit.edu>
 
 	* k5-int.h (krb5_os_context) 
diff --git a/src/include/port-sockets.h b/src/include/port-sockets.h
index eb87bc1c9..09e3cfb41 100644
--- a/src/include/port-sockets.h
+++ b/src/include/port-sockets.h
@@ -157,14 +157,14 @@ typedef struct iovec sg_buf;
 #define inet_ntop(AF,SRC,DST,CNT)					    \
     ((AF) == AF_INET							    \
      ? ((CNT) < 16							    \
-	? (SOCKET_SET_ERRNO(ENOSPC), NULL)				    \
+	? (SOCKET_SET_ERRNO(ENOSPC), (const char *)NULL)		    \
 	: (sprintf((DST), "%d.%d.%d.%d",				    \
 		   ((const unsigned char *)(const void *)(SRC))[0] & 0xff,  \
 		   ((const unsigned char *)(const void *)(SRC))[1] & 0xff,  \
 		   ((const unsigned char *)(const void *)(SRC))[2] & 0xff,  \
 		   ((const unsigned char *)(const void *)(SRC))[3] & 0xff), \
 	   (DST)))							    \
-     : (SOCKET_SET_ERRNO(EAFNOSUPPORT), NULL))
+     : (SOCKET_SET_ERRNO(EAFNOSUPPORT), (const char *)NULL))
 #define HAVE_INET_NTOP
 #endif