From 1abe65d928440b3b23d25746b966dd4169c358b9 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Fri, 26 Dec 2014 20:45:21 +0000 Subject: code/docs: Use Unix rather than UNIX to avoid use of the trademark Use Unix when generically writing about Unix based systems as UNIX is the trademark and should only be used in a particular product's name. --- tests/server/sws.c | 6 +++--- tests/server/tftpd.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/server') diff --git a/tests/server/sws.c b/tests/server/sws.c index 24bfdebe9..8cd30c5a5 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -1368,7 +1368,7 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port) #endif /* ENABLE_IPV6 */ #ifdef USE_UNIX_SOCKETS case AF_UNIX: - logmsg("Proxying through UNIX socket is not (yet?) supported."); + logmsg("Proxying through Unix socket is not (yet?) supported."); return CURL_SOCKET_BAD; #endif /* USE_UNIX_SOCKETS */ } @@ -2163,7 +2163,7 @@ int main(int argc, char *argv[]) goto sws_cleanup; } /* socket server is not alive, now check if it was actually a socket. - * Systems which have UNIX sockets will also have lstat */ + * Systems which have Unix sockets will also have lstat */ rc = lstat(unix_socket, &statbuf); if (0 != rc) { logmsg("Error binding socket, failed to stat %s: (%d) %s", @@ -2208,7 +2208,7 @@ int main(int argc, char *argv[]) } #ifdef USE_UNIX_SOCKETS - /* listen succeeds, so let's assume a valid listening UNIX socket */ + /* listen succeeds, so let's assume a valid listening Unix socket */ unlink_socket = true; #endif diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index 745efad3a..25557932f 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -1371,7 +1371,7 @@ abort: /* * Send a nak packet (error message). Error code passed in is one of the - * standard TFTP codes, or a UNIX errno offset by 100. + * standard TFTP codes, or a Unix errno offset by 100. */ static void nak(int error) { -- cgit v1.2.3