aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/curl_addrinfo.c2
-rw-r--r--lib/curl_config.h.cmake2
-rw-r--r--lib/ftplistparser.c8
-rw-r--r--lib/url.c6
-rw-r--r--lib/urldata.h10
5 files changed, 14 insertions, 14 deletions
diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index f28361062..1e359d5c7 100644
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -482,7 +482,7 @@ Curl_addrinfo *Curl_str2addr(char *address, int port)
#ifdef USE_UNIX_SOCKETS
/**
- * Given a path to a UNIX domain socket, return a newly allocated Curl_addrinfo
+ * Given a path to a Unix domain socket, return a newly allocated Curl_addrinfo
* struct initialized with this path.
*/
Curl_addrinfo *Curl_unix2addr(const char *path)
diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index bd367c28d..87be9c717 100644
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -912,7 +912,7 @@
/* if SSL is enabled */
#cmakedefine USE_SSLEAY 1
-/* if UNIX domain sockets are enabled */
+/* if Unix domain sockets are enabled */
#cmakedefine USE_UNIX_SOCKETS
/* Define to 1 if you are building a Windows target without large file
diff --git a/lib/ftplistparser.c b/lib/ftplistparser.c
index a6c6dea9f..9aacad914 100644
--- a/lib/ftplistparser.c
+++ b/lib/ftplistparser.c
@@ -23,13 +23,13 @@
/**
* Now implemented:
*
- * 1) UNIX version 1
+ * 1) Unix version 1
* drwxr-xr-x 1 user01 ftp 512 Jan 29 23:32 prog
- * 2) UNIX version 2
+ * 2) Unix version 2
* drwxr-xr-x 1 user01 ftp 512 Jan 29 1997 prog
- * 3) UNIX version 3
+ * 3) Unix version 3
* drwxr-xr-x 1 1 1 512 Jan 29 23:32 prog
- * 4) UNIX symlink
+ * 4) Unix symlink
* lrwxr-xr-x 1 user01 ftp 512 Jan 29 23:32 prog -> prog2000
* 5) DOS style
* 01-29-97 11:32PM <DIR> prog
diff --git a/lib/url.c b/lib/url.c
index 3d6f8fd14..788f04849 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -5089,7 +5089,7 @@ static CURLcode resolve_server(struct SessionHandle *data,
#ifdef USE_UNIX_SOCKETS
if(data->set.str[STRING_UNIX_SOCKET_PATH]) {
- /* UNIX domain sockets are local. The host gets ignored, just use the
+ /* Unix domain sockets are local. The host gets ignored, just use the
* specified domain socket address. Do not cache "DNS entries". There is
* no DNS involved and we already have the filesystem path available */
const char *path = data->set.str[STRING_UNIX_SOCKET_PATH];
@@ -5102,7 +5102,7 @@ static CURLcode resolve_server(struct SessionHandle *data,
else {
/* Long paths are not supported for now */
if(strlen(path) >= sizeof(((struct sockaddr_un *)0)->sun_path)) {
- failf(data, "UNIX socket path too long: '%s'", path);
+ failf(data, "Unix socket path too long: '%s'", path);
result = CURLE_COULDNT_RESOLVE_HOST;
}
else
@@ -5430,7 +5430,7 @@ static CURLcode create_conn(struct SessionHandle *data,
#ifdef USE_UNIX_SOCKETS
if(proxy && data->set.str[STRING_UNIX_SOCKET_PATH]) {
- free(proxy); /* UNIX domain sockets cannot be proxied, so disable it */
+ free(proxy); /* Unix domain sockets cannot be proxied, so disable it */
proxy = NULL;
}
#endif
diff --git a/lib/urldata.h b/lib/urldata.h
index 79fcd9a4d..5f774704a 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -1420,18 +1420,18 @@ enum dupstring {
STRING_SSH_KNOWNHOSTS, /* file name of knownhosts file */
#endif
#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)
- STRING_SOCKS5_GSSAPI_SERVICE, /* GSSAPI service name */
+ STRING_SOCKS5_GSSAPI_SERVICE, /* GSSAPI service name */
#endif
STRING_MAIL_FROM,
STRING_MAIL_AUTH,
#ifdef USE_TLS_SRP
- STRING_TLSAUTH_USERNAME, /* TLS auth <username> */
- STRING_TLSAUTH_PASSWORD, /* TLS auth <password> */
+ STRING_TLSAUTH_USERNAME, /* TLS auth <username> */
+ STRING_TLSAUTH_PASSWORD, /* TLS auth <password> */
#endif
- STRING_BEARER, /* <bearer>, if used */
+ STRING_BEARER, /* <bearer>, if used */
#ifdef USE_UNIX_SOCKETS
- STRING_UNIX_SOCKET_PATH, /* path to UNIX socket, if used */
+ STRING_UNIX_SOCKET_PATH, /* path to Unix socket, if used */
#endif
/* -- end of zero-terminated strings -- */