summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-01-13 23:58:22 +0100
committerDaniel Stenberg <daniel@haxx.se>2017-01-14 00:00:07 +0100
commit6e12bb7cbeda99be8a9c2aace18180784b6b7e26 (patch)
tree01a7ebefc550127a0d641afc0b8955562cdacbd0
parentd24c4ea2d0d49167dda4b6afb2df47bae77068a8 (diff)
downloadcurl-6e12bb7cbeda99be8a9c2aace18180784b6b7e26.tar.gz
addrinfo: fix compiler warning on offsetof() use
curl_addrinfo.c:519:20: error: conversion to ‘curl_socklen_t {aka unsigned int}’ from ‘long unsigned int’ may alter its value [-Werror=conversion] Follow-up to 1d786faee1046f
-rw-r--r--lib/curl_addrinfo.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index 7182a0066..3dbfb3ebf 100644
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -516,7 +516,8 @@ Curl_addrinfo *Curl_unix2addr(const char *path, bool *longpath, bool abstract)
ai->ai_family = AF_UNIX;
ai->ai_socktype = SOCK_STREAM; /* assume reliable transport for HTTP */
- ai->ai_addrlen = offsetof(struct sockaddr_un, sun_path) + path_len;
+ ai->ai_addrlen = (curl_socklen_t)
+ ((offsetof(struct sockaddr_un, sun_path) + path_len) & 0x7FFFFFFF);
/* Abstract Unix domain socket have NULL prefix instead of suffix */
if(abstract)