2005-05-19 Paul Jakma <paul@dishone.st>

	* sockunion.c: (sockunion_getsockname) use MTYPE_SOCKUNION, not TMP
	  (sockunion_getpeername) ditto

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 82ea6fd1d3a089fd1dbd99fd0012cac3edc0458b..3b836048117a725ba82559b6e4afcfb822ac5b29 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -3,6 +3,8 @@
        * thread.c: (thread_cancel_event) the number of pending events
          cancelled is potentially useful information, dont throw it away,
          pass it back to the caller.
+       * sockunion.c: (sockunion_getsockname) use MTYPE_SOCKUNION, not TMP
+         (sockunion_getpeername) ditto
 
 2005-05-15 Paul Jakma <paul@dishone.st>
 

diff --git a/lib/sockunion.c b/lib/sockunion.c
index a636c64125a559a7171f009495e0c45144fe059e..e79f034c8133c9dfb28829ca737848d1001d477b 100644 (file)
--- a/lib/sockunion.c
+++ b/lib/sockunion.c
@@ -582,14 +582,14 @@ sockunion_getsockname (int fd)
 
   if (name.sa.sa_family == AF_INET)
     {
-      su = XCALLOC (MTYPE_TMP, sizeof (union sockunion));
+      su = XCALLOC (MTYPE_SOCKUNION, sizeof (union sockunion));
       memcpy (su, &name, sizeof (struct sockaddr_in));
       return su;
     }
 #ifdef HAVE_IPV6
   if (name.sa.sa_family == AF_INET6)
     {
-      su = XCALLOC (MTYPE_TMP, sizeof (union sockunion));
+      su = XCALLOC (MTYPE_SOCKUNION, sizeof (union sockunion));
       memcpy (su, &name, sizeof (struct sockaddr_in6));
 
       if (IN6_IS_ADDR_V4MAPPED (&su->sin6.sin6_addr))
@@ -636,14 +636,14 @@ sockunion_getpeername (int fd)
 
   if (name.sa.sa_family == AF_INET)
     {
-      su = XCALLOC (MTYPE_TMP, sizeof (union sockunion));
+      su = XCALLOC (MTYPE_SOCKUNION, sizeof (union sockunion));
       memcpy (su, &name, sizeof (struct sockaddr_in));
       return su;
     }
 #ifdef HAVE_IPV6
   if (name.sa.sa_family == AF_INET6)
     {
-      su = XCALLOC (MTYPE_TMP, sizeof (union sockunion));
+      su = XCALLOC (MTYPE_SOCKUNION, sizeof (union sockunion));
       memcpy (su, &name, sizeof (struct sockaddr_in6));
 
       if (IN6_IS_ADDR_V4MAPPED (&su->sin6.sin6_addr))