faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

util: remove UTI_SockaddrToString()

Browse source 
It is no longer used after the conversions.
This commit is contained in:
Miroslav Lichvar 2019-07-18 09:35:59 +02:00
parent bb1c02e9f5
commit 91da65a782
3 changed files with 0 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
test/unit/util.c
View file

@ -6,7 +6,6 @@ void test_unit(void) {
NTP_int32 ntp32_ts; NTP_int32 ntp32_ts;
struct timespec ts, ts2; struct timespec ts, ts2;
struct timeval tv; struct timeval tv;
struct sockaddr_un sun;
double x, y, nan, inf; double x, y, nan, inf;
Timespec tspec; Timespec tspec;
Float f; Float f;
@ -209,20 +208,6 @@ void test_unit(void) {
} }
TEST_CHECK(c > 46000 && c < 48000); 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"); s = UTI_PathToDir("/aaa/bbb/ccc/ddd");
TEST_CHECK(!strcmp(s, "/aaa/bbb/ccc")); TEST_CHECK(!strcmp(s, "/aaa/bbb/ccc"));
Free(s); Free(s);

32
util.c
View file

@ -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 * const char *
UTI_SockaddrFamilyToString(int family) UTI_SockaddrFamilyToString(int family)
{ {

1
util.h
View file

@ -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 void UTI_SockaddrToIPAndPort(struct sockaddr *sa, IPAddr *ip, unsigned short *port);
extern int UTI_IPAndPortToSockaddr(IPAddr *ip, unsigned short port, struct sockaddr *sa); 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 const char *UTI_SockaddrFamilyToString(int family);
extern char *UTI_IPSockAddrToString(IPSockAddr *sa); extern char *UTI_IPSockAddrToString(IPSockAddr *sa);