diff --git a/test/unit/util.c b/test/unit/util.c index 6ce6f90..e3b2f30 100644 --- a/test/unit/util.c +++ b/test/unit/util.c @@ -6,7 +6,6 @@ void test_unit(void) { NTP_int32 ntp32_ts; struct timespec ts, ts2; struct timeval tv; - struct sockaddr_un sun; double x, y, nan, inf; Timespec tspec; Float f; @@ -209,20 +208,6 @@ void test_unit(void) { } TEST_CHECK(c > 46000 && c < 48000); - for (i = 1; i < 2 * BUFFER_LENGTH; i++) { - sun.sun_family = AF_UNIX; - for (j = 0; j + 1 < i && j + 1 < sizeof (sun.sun_path); j++) - sun.sun_path[j] = 'A' + j % 26; - sun.sun_path[j] = '\0'; - s = UTI_SockaddrToString((struct sockaddr *)&sun); - if (i <= BUFFER_LENGTH) { - TEST_CHECK(!strcmp(s, sun.sun_path)); - } else { - TEST_CHECK(!strncmp(s, sun.sun_path, BUFFER_LENGTH - 2)); - TEST_CHECK(s[BUFFER_LENGTH - 2] == '>'); - } - } - s = UTI_PathToDir("/aaa/bbb/ccc/ddd"); TEST_CHECK(!strcmp(s, "/aaa/bbb/ccc")); Free(s); diff --git a/util.c b/util.c index 7108c17..6504710 100644 --- a/util.c +++ b/util.c @@ -551,38 +551,6 @@ UTI_IPAndPortToSockaddr(IPAddr *ip, unsigned short port, struct sockaddr *sa) /* ================================================== */ -char *UTI_SockaddrToString(struct sockaddr *sa) -{ - unsigned short port; - IPAddr ip; - char *result, *sun_path; - - result = NEXT_BUFFER; - - switch (sa->sa_family) { - case AF_INET: -#ifdef AF_INET6 - case AF_INET6: -#endif - UTI_SockaddrToIPAndPort(sa, &ip, &port); - snprintf(result, BUFFER_LENGTH, "%s:%hu", UTI_IPToString(&ip), port); - break; - case AF_UNIX: - sun_path = ((struct sockaddr_un *)sa)->sun_path; - snprintf(result, BUFFER_LENGTH, "%.*s", BUFFER_LENGTH - 1, sun_path); - /* Indicate truncated path */ - if (strlen(sun_path) >= BUFFER_LENGTH) - result[BUFFER_LENGTH - 2] = '>'; - break; - default: - snprintf(result, BUFFER_LENGTH, "[UNKNOWN]"); - } - - return result; -} - -/* ================================================== */ - const char * UTI_SockaddrFamilyToString(int family) { diff --git a/util.h b/util.h index 8a0e37c..90b69fd 100644 --- a/util.h +++ b/util.h @@ -112,7 +112,6 @@ extern int UTI_CompareIPs(IPAddr *a, IPAddr *b, IPAddr *mask); extern void UTI_SockaddrToIPAndPort(struct sockaddr *sa, IPAddr *ip, unsigned short *port); extern int UTI_IPAndPortToSockaddr(IPAddr *ip, unsigned short port, struct sockaddr *sa); -extern char *UTI_SockaddrToString(struct sockaddr *sa); extern const char *UTI_SockaddrFamilyToString(int family); extern char *UTI_IPSockAddrToString(IPSockAddr *sa);