Move uv_ip4_addr to uv-common.c

This commit is contained in:
Ryan Dahl 2011-06-17 18:56:43 +02:00
parent 8218146a1c
commit b7b7df090c
3 changed files with 14 additions and 24 deletions

View File

@ -23,6 +23,7 @@
#include <assert.h>
#include <stddef.h> /* NULL */
#include <string.h> /* memset */
static uv_counters_t counters;
@ -75,3 +76,16 @@ const char* uv_err_name(uv_err_t err) {
return NULL;
}
}
struct sockaddr_in uv_ip4_addr(const char* ip, int port) {
struct sockaddr_in addr;
memset(&addr, 0, sizeof(struct sockaddr_in));
addr.sin_family = AF_INET;
addr.sin_port = htons(port);
addr.sin_addr.s_addr = inet_addr(ip);
return addr;
}

View File

@ -122,19 +122,6 @@ static uv_err_t uv_err_new(uv_handle_t* handle, int sys_error) {
}
struct sockaddr_in uv_ip4_addr(const char* ip, int port) {
struct sockaddr_in addr;
memset(&addr, 0, sizeof(struct sockaddr_in));
addr.sin_family = AF_INET;
addr.sin_port = htons(port);
addr.sin_addr.s_addr = inet_addr(ip);
return addr;
}
int uv_close(uv_handle_t* handle, uv_close_cb close_cb) {
uv_tcp_t* tcp;
uv_async_t* async;

View File

@ -705,17 +705,6 @@ int uv_close(uv_handle_t* handle, uv_close_cb close_cb) {
}
struct sockaddr_in uv_ip4_addr(const char* ip, int port) {
struct sockaddr_in addr;
addr.sin_family = AF_INET;
addr.sin_port = htons(port);
addr.sin_addr.s_addr = inet_addr(ip);
return addr;
}
int uv_bind(uv_tcp_t* handle, struct sockaddr_in addr) {
DWORD err;
int r;