diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-05-27 22:29:55 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2017-05-28 07:14:49 -0400 |
| commit | 62d020aba1b4940980903a54839ad1f26f2d1527 (patch) | |
| tree | e6e323ae88248f50f2c8f81efea3d85b6e52b32b /src/nvim/event/socket.c | |
| parent | 6c135b89ee83a9b278cba88889fe4f388ee8aebd (diff) | |
| download | rneovim-62d020aba1b4940980903a54839ad1f26f2d1527.tar.gz rneovim-62d020aba1b4940980903a54839ad1f26f2d1527.tar.bz2 rneovim-62d020aba1b4940980903a54839ad1f26f2d1527.zip | |
socket_watcher_start: Silence conversion warning for sin(6)_port
Although in_port_t is a typedef for uint16_t, GCC in Ubuntu 12.04
complains about potential loss of data due to converting int to
uint16_t. Since we know this isn't possible, silence the warning to
avoid breaking QB until it gets upgraded to a newer Ubuntu.
Diffstat (limited to 'src/nvim/event/socket.c')
| -rw-r--r-- | src/nvim/event/socket.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/event/socket.c b/src/nvim/event/socket.c index 997dd29a7f..bc5a4ec75e 100644 --- a/src/nvim/event/socket.c +++ b/src/nvim/event/socket.c @@ -103,9 +103,9 @@ int socket_watcher_start(SocketWatcher *watcher, int backlog, socket_cb cb) // contain 0 in this case, unless uv_tcp_getsockname() is used first. uv_tcp_getsockname(&watcher->uv.tcp.handle, (struct sockaddr *)&sas, &(int){ sizeof(sas) }); - uint16_t port = (sas.ss_family == AF_INET) - ? ((struct sockaddr_in *)&sas)->sin_port - : ((struct sockaddr_in6 *)&sas)->sin6_port; + uint16_t port = (uint16_t)((sas.ss_family == AF_INET) + ? ((struct sockaddr_in *)&sas)->sin_port + : ((struct sockaddr_in6 *)&sas)->sin6_port); // v:servername uses the string from watcher->addr size_t len = strlen(watcher->addr); snprintf(watcher->addr+len, sizeof(watcher->addr)-len, ":%" PRIu16, |