Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-04 03:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

libuv: Add missing casts.

Browse Source
This commit is contained in:
Peter Johnson
2018-06-17 13:24:40 -07:00
parent 321c144d21
commit 873b2ed13c
35 changed files with 141 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wpiutil/src/main/native/libuv/fs-poll.cpp
View File

@@ -67,7 +67,7 @@ int uv_fs_poll_start(uv_fs_poll_t* handle,
loop = handle->loop;
len = strlen(path);
ctx = uv__calloc(1, sizeof(*ctx) + len);
ctx = (struct poll_ctx*)uv__calloc(1, sizeof(*ctx) + len);
if (ctx == NULL)
return UV_ENOMEM;
@@ -107,7 +107,7 @@ int uv_fs_poll_stop(uv_fs_poll_t* handle) {
if (!uv__is_active(handle))
return 0;
ctx = handle->poll_ctx;
ctx = (struct poll_ctx*)handle->poll_ctx;
assert(ctx != NULL);
assert(ctx->parent_handle != NULL);
ctx->parent_handle = NULL;
@@ -134,7 +134,7 @@ int uv_fs_poll_getpath(uv_fs_poll_t* handle, char* buffer, size_t* size) {
return UV_EINVAL;
}
ctx = handle->poll_ctx;
ctx = (struct poll_ctx*)handle->poll_ctx;
assert(ctx != NULL);
required_len = strlen(ctx->path);

11
wpiutil/src/main/native/libuv/inet.cpp
View File

@@ -40,9 +40,9 @@ static int inet_pton6(const char *src, unsigned char *dst);
int uv_inet_ntop(int af, const void* src, char* dst, size_t size) {
switch (af) {
case AF_INET:
return (inet_ntop4(src, dst, size));
return (inet_ntop4((const unsigned char*)src, dst, size));
case AF_INET6:
return (inet_ntop6(src, dst, size));
return (inet_ntop6((const unsigned char*)src, dst, size));
default:
return UV_EAFNOSUPPORT;
}
@@ -160,10 +160,11 @@ int uv_inet_pton(int af, const char* src, void* dst) {
switch (af) {
case AF_INET:
return (inet_pton4(src, dst));
return (inet_pton4(src, (unsigned char*)dst));
case AF_INET6: {
int len;
char tmp[UV__INET6_ADDRSTRLEN], *s, *p;
char tmp[UV__INET6_ADDRSTRLEN], *s;
const char *p;
s = (char*) src;
p = strchr(src, '%');
if (p != NULL) {
@@ -174,7 +175,7 @@ int uv_inet_pton(int af, const char* src, void* dst) {
memcpy(s, src, len);
s[len] = '\0';
}
return inet_pton6(s, dst);
return inet_pton6(s, (unsigned char*)dst);
}
default:
return UV_EAFNOSUPPORT;

2
wpiutil/src/main/native/libuv/threadpool.cpp
View File

@@ -142,7 +142,7 @@ static void init_threads(void) {
threads = default_threads;
if (nthreads > ARRAY_SIZE(default_threads)) {
threads = uv__malloc(nthreads * sizeof(threads[0]));
threads = (uv_thread_t*)uv__malloc(nthreads * sizeof(threads[0]));
if (threads == NULL) {
nthreads = ARRAY_SIZE(default_threads);
threads = default_threads;

6
wpiutil/src/main/native/libuv/unix/android-ifaddrs.cpp
View File

@@ -191,7 +191,7 @@ static struct nlmsghdr *getNetlinkResponse(int p_socket, pid_t p_pid, int *p_siz
static NetlinkList *newListItem(struct nlmsghdr *p_data, unsigned int p_size)
{
NetlinkList *l_item = uv__malloc(sizeof(NetlinkList));
NetlinkList *l_item = (NetlinkList*)uv__malloc(sizeof(NetlinkList));
if (l_item == NULL)
{
return NULL;
@@ -357,7 +357,7 @@ static int interpretLink(struct nlmsghdr *p_hdr, struct ifaddrs **p_resultList)
}
}
l_entry = uv__malloc(sizeof(struct ifaddrs) + sizeof(int) + l_nameSize + l_addrSize + l_dataSize);
l_entry = (struct ifaddrs*)uv__malloc(sizeof(struct ifaddrs) + sizeof(int) + l_nameSize + l_addrSize + l_dataSize);
if (l_entry == NULL)
{
return -1;
@@ -486,7 +486,7 @@ static int interpretAddr(struct nlmsghdr *p_hdr, struct ifaddrs **p_resultList,
}
}
l_entry = uv__malloc(sizeof(struct ifaddrs) + l_nameSize + l_addrSize);
l_entry = (struct ifaddrs*)uv__malloc(sizeof(struct ifaddrs) + l_nameSize + l_addrSize);
if (l_entry == NULL)
{
return -1;

3
wpiutil/src/main/native/libuv/unix/bsd-ifaddrs.cpp
View File

@@ -81,7 +81,8 @@ int uv_interface_addresses(uv_interface_address_t** addresses, int* count) {
(*count)++;
}
*addresses = uv__malloc(*count * sizeof(**addresses));
*addresses =
(uv_interface_address_t*)uv__malloc(*count * sizeof(**addresses));
if (*addresses == NULL) {
freeifaddrs(addrs);

12
wpiutil/src/main/native/libuv/unix/core.cpp
View File

@@ -813,15 +813,15 @@ static void maybe_resize(uv_loop_t* loop, unsigned int len) {
}
nwatchers = next_power_of_two(len + 2) - 2;
watchers = uv__realloc(loop->watchers,
(nwatchers + 2) * sizeof(loop->watchers[0]));
watchers = (uv__io_t**)
uv__realloc(loop->watchers, (nwatchers + 2) * sizeof(loop->watchers[0]));
if (watchers == NULL)
abort();
for (i = loop->nwatchers; i < nwatchers; i++)
watchers[i] = NULL;
watchers[nwatchers] = fake_watcher_list;
watchers[nwatchers + 1] = fake_watcher_count;
watchers[nwatchers] = (uv__io_t*)fake_watcher_list;
watchers[nwatchers + 1] = (uv__io_t*)fake_watcher_count;
loop->watchers = watchers;
loop->nwatchers = nwatchers;
@@ -1172,7 +1172,7 @@ int uv__getpwuid_r(uv_passwd_t* pwd) {
for (;;) {
uv__free(buf);
buf = uv__malloc(bufsize);
buf = (char*)uv__malloc(bufsize);
if (buf == NULL)
return UV_ENOMEM;
@@ -1199,7 +1199,7 @@ int uv__getpwuid_r(uv_passwd_t* pwd) {
name_size = strlen(pw.pw_name) + 1;
homedir_size = strlen(pw.pw_dir) + 1;
shell_size = strlen(pw.pw_shell) + 1;
pwd->username = uv__malloc(name_size + homedir_size + shell_size);
pwd->username = (char*)uv__malloc(name_size + homedir_size + shell_size);
if (pwd->username == NULL) {
uv__free(buf);

5
wpiutil/src/main/native/libuv/unix/darwin-proctitle.cpp
View File

@@ -138,8 +138,9 @@ int uv__set_process_title(const char* title) {
if (pLSSetApplicationInformationItem == NULL)
goto out;
display_name_key = pCFBundleGetDataPointerForName(launch_services_bundle,
S("_kLSDisplayNameKey"));
display_name_key = (CFStringRef*)
pCFBundleGetDataPointerForName(launch_services_bundle,
S("_kLSDisplayNameKey"));
if (display_name_key == NULL || *display_name_key == NULL)
goto out;

2
wpiutil/src/main/native/libuv/unix/darwin.cpp
View File

@@ -194,7 +194,7 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) {
return UV_EINVAL; /* FIXME(bnoordhuis) Translate error. */
}
*cpu_infos = uv__malloc(numcpus * sizeof(**cpu_infos));
*cpu_infos = (uv_cpu_info_t*)uv__malloc(numcpus * sizeof(**cpu_infos));
if (!(*cpu_infos)) {
vm_deallocate(mach_task_self(), (vm_address_t)info, msg_type);
return UV_ENOMEM;

4
wpiutil/src/main/native/libuv/unix/freebsd.cpp
View File

@@ -315,7 +315,7 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) {
if (sysctlbyname("hw.ncpu", &numcpus, &size, NULL, 0))
return UV__ERR(errno);
*cpu_infos = uv__malloc(numcpus * sizeof(**cpu_infos));
*cpu_infos = (uv_cpu_info_t*)uv__malloc(numcpus * sizeof(**cpu_infos));
if (!(*cpu_infos))
return UV_ENOMEM;
@@ -332,7 +332,7 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) {
size = maxcpus * CPUSTATES * sizeof(long);
cp_times = uv__malloc(size);
cp_times = (long*)uv__malloc(size);
if (cp_times == NULL) {
uv__free(*cpu_infos);
return UV_ENOMEM;

10
wpiutil/src/main/native/libuv/unix/fs.cpp
View File

@@ -106,7 +106,7 @@
size_t new_path_len; \
path_len = strlen(path) + 1; \
new_path_len = strlen(new_path) + 1; \
req->path = uv__malloc(path_len + new_path_len); \
req->path = (char*)uv__malloc(path_len + new_path_len); \
if (req->path == NULL) \
return UV_ENOMEM; \
req->new_path = req->path + path_len; \
@@ -437,7 +437,7 @@ static ssize_t uv__fs_readlink(uv_fs_t* req) {
char* buf;
len = uv__fs_pathmax_size(req->path);
buf = uv__malloc(len + 1);
buf = (char*)uv__malloc(len + 1);
if (buf == NULL) {
errno = ENOMEM;
@@ -467,7 +467,7 @@ static ssize_t uv__fs_realpath(uv_fs_t* req) {
char* buf;
len = uv__fs_pathmax_size(req->path);
buf = uv__malloc(len + 1);
buf = (char*)uv__malloc(len + 1);
if (buf == NULL) {
errno = ENOMEM;
@@ -1380,7 +1380,7 @@ int uv_fs_read(uv_loop_t* loop, uv_fs_t* req,
req->nbufs = nbufs;
req->bufs = req->bufsml;
if (nbufs > ARRAY_SIZE(req->bufsml))
req->bufs = uv__malloc(nbufs * sizeof(*bufs));
req->bufs = (uv_buf_t*)uv__malloc(nbufs * sizeof(*bufs));
if (req->bufs == NULL)
return UV_ENOMEM;
@@ -1516,7 +1516,7 @@ int uv_fs_write(uv_loop_t* loop,
req->nbufs = nbufs;
req->bufs = req->bufsml;
if (nbufs > ARRAY_SIZE(req->bufsml))
req->bufs = uv__malloc(nbufs * sizeof(*bufs));
req->bufs = (uv_buf_t*)uv__malloc(nbufs * sizeof(*bufs));
if (req->bufs == NULL)
return UV_ENOMEM;

40
wpiutil/src/main/native/libuv/unix/fsevents.cpp
View File

@@ -185,7 +185,7 @@ static void (*pFSEventStreamStop)(FSEventStreamRef);
static void uv__fsevents_cb(uv_async_t* cb) {
uv_fs_event_t* handle;
handle = cb->data;
handle = (uv_fs_event_t*)cb->data;
UV__FSEVENTS_PROCESS(handle, {
handle->cb(handle, event->path[0] ? event->path : NULL, event->events, 0);
@@ -233,10 +233,10 @@ static void uv__fsevents_event_cb(ConstFSEventStreamRef streamRef,
FSEventStreamEventFlags flags;
QUEUE head;
loop = info;
state = loop->cf_state;
loop = (uv_loop_t*)info;
state = (uv__cf_loop_state_t*)loop->cf_state;
assert(state != NULL);
paths = eventPaths;
paths = (char**)eventPaths;
/* For each handle */
uv_mutex_lock(&state->fsevent_mutex);
@@ -291,7 +291,7 @@ static void uv__fsevents_event_cb(ConstFSEventStreamRef streamRef,
len = 0;
#endif /* MAC_OS_X_VERSION_10_7 */
event = uv__malloc(sizeof(*event) + len);
event = (uv__fsevents_event_t*)uv__malloc(sizeof(*event) + len);
if (event == NULL)
break;
@@ -372,7 +372,7 @@ static int uv__fsevents_create_stream(uv_loop_t* loop, CFArrayRef paths) {
flags);
assert(ref != NULL);
state = loop->cf_state;
state = (uv__cf_loop_state_t*)loop->cf_state;
pFSEventStreamScheduleWithRunLoop(ref,
state->loop,
*pkCFRunLoopDefaultMode);
@@ -391,7 +391,7 @@ static int uv__fsevents_create_stream(uv_loop_t* loop, CFArrayRef paths) {
static void uv__fsevents_destroy_stream(uv_loop_t* loop) {
uv__cf_loop_state_t* state;
state = loop->cf_state;
state = (uv__cf_loop_state_t*)loop->cf_state;
if (state->fsevent_stream == NULL)
return;
@@ -418,7 +418,7 @@ static void uv__fsevents_reschedule(uv_fs_event_t* handle,
int err;
unsigned int path_count;
state = handle->loop->cf_state;
state = (uv__cf_loop_state_t*)handle->loop->cf_state;
paths = NULL;
cf_paths = NULL;
err = 0;
@@ -446,7 +446,7 @@ static void uv__fsevents_reschedule(uv_fs_event_t* handle,
uv_mutex_lock(&state->fsevent_mutex);
path_count = state->fsevent_handle_count;
if (path_count != 0) {
paths = uv__malloc(sizeof(*paths) * path_count);
paths = (CFStringRef*)uv__malloc(sizeof(*paths) * path_count);
if (paths == NULL) {
uv_mutex_unlock(&state->fsevent_mutex);
goto final;
@@ -605,7 +605,7 @@ static int uv__fsevents_loop_init(uv_loop_t* loop) {
if (err)
return err;
state = uv__calloc(1, sizeof(*state));
state = (uv__cf_loop_state_t*)uv__calloc(1, sizeof(*state));
if (state == NULL)
return UV_ENOMEM;
@@ -713,7 +713,7 @@ void uv__fsevents_loop_delete(uv_loop_t* loop) {
}
/* Destroy state */
state = loop->cf_state;
state = (uv__cf_loop_state_t*)loop->cf_state;
uv_sem_destroy(&state->fsevent_sem);
uv_mutex_destroy(&state->fsevent_mutex);
pCFRelease(state->signal_source);
@@ -727,8 +727,8 @@ static void* uv__cf_loop_runner(void* arg) {
uv_loop_t* loop;
uv__cf_loop_state_t* state;
loop = arg;
state = loop->cf_state;
loop = (uv_loop_t*)arg;
state = (uv__cf_loop_state_t*)loop->cf_state;
state->loop = pCFRunLoopGetCurrent();
pCFRunLoopAddSource(state->loop,
@@ -754,8 +754,8 @@ static void uv__cf_loop_cb(void* arg) {
QUEUE split_head;
uv__cf_loop_signal_t* s;
loop = arg;
state = loop->cf_state;
loop = (uv_loop_t*)arg;
state = (uv__cf_loop_state_t*)loop->cf_state;
uv_mutex_lock(&loop->cf_mutex);
QUEUE_MOVE(&loop->cf_signals, &split_head);
@@ -785,7 +785,7 @@ int uv__cf_loop_signal(uv_loop_t* loop,
uv__cf_loop_signal_t* item;
uv__cf_loop_state_t* state;
item = uv__malloc(sizeof(*item));
item = (uv__cf_loop_signal_t*)uv__malloc(sizeof(*item));
if (item == NULL)
return UV_ENOMEM;
@@ -796,7 +796,7 @@ int uv__cf_loop_signal(uv_loop_t* loop,
QUEUE_INSERT_TAIL(&loop->cf_signals, &item->member);
uv_mutex_unlock(&loop->cf_mutex);
state = loop->cf_state;
state = (uv__cf_loop_state_t*)loop->cf_state;
assert(state != NULL);
pCFRunLoopSourceSignal(state->signal_source);
pCFRunLoopWakeUp(state->loop);
@@ -828,7 +828,7 @@ int uv__fsevents_init(uv_fs_event_t* handle) {
* Events will occur in other thread.
* Initialize callback for getting them back into event loop's thread
*/
handle->cf_cb = uv__malloc(sizeof(*handle->cf_cb));
handle->cf_cb = (uv_async_t*)uv__malloc(sizeof(*handle->cf_cb));
if (handle->cf_cb == NULL) {
err = UV_ENOMEM;
goto fail_cf_cb_malloc;
@@ -844,7 +844,7 @@ int uv__fsevents_init(uv_fs_event_t* handle) {
goto fail_cf_mutex_init;
/* Insert handle into the list */
state = handle->loop->cf_state;
state = (uv__cf_loop_state_t*)handle->loop->cf_state;
uv_mutex_lock(&state->fsevent_mutex);
QUEUE_INSERT_TAIL(&state->fsevent_handles, &handle->cf_member);
state->fsevent_handle_count++;
@@ -884,7 +884,7 @@ int uv__fsevents_close(uv_fs_event_t* handle) {
return UV_EINVAL;
/* Remove handle from the list */
state = handle->loop->cf_state;
state = (uv__cf_loop_state_t*)handle->loop->cf_state;
uv_mutex_lock(&state->fsevent_mutex);
QUEUE_REMOVE(&handle->cf_member);
state->fsevent_handle_count--;

8
wpiutil/src/main/native/libuv/unix/getaddrinfo.cpp
View File

@@ -153,7 +153,7 @@ int uv_getaddrinfo(uv_loop_t* loop,
hostname_len = hostname ? strlen(hostname) + 1 : 0;
service_len = service ? strlen(service) + 1 : 0;
hints_len = hints ? sizeof(*hints) : 0;
buf = uv__malloc(hostname_len + service_len + hints_len);
buf = (char*)uv__malloc(hostname_len + service_len + hints_len);
if (buf == NULL)
return UV_ENOMEM;
@@ -171,17 +171,17 @@ int uv_getaddrinfo(uv_loop_t* loop,
len = 0;
if (hints) {
req->hints = memcpy(buf + len, hints, sizeof(*hints));
req->hints = (struct addrinfo*)memcpy(buf + len, hints, sizeof(*hints));
len += sizeof(*hints);
}
if (service) {
req->service = memcpy(buf + len, service, service_len);
req->service = (char*)memcpy(buf + len, service, service_len);
len += service_len;
}
if (hostname)
req->hostname = memcpy(buf + len, hostname, hostname_len);
req->hostname = (char*)memcpy(buf + len, hostname, hostname_len);
if (cb) {
uv__work_submit(loop,

4
wpiutil/src/main/native/libuv/unix/ibmi.cpp
View File

@@ -90,7 +90,7 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) {
numcpus = sysconf(_SC_NPROCESSORS_ONLN);
*cpu_infos = uv__malloc(numcpus * sizeof(uv_cpu_info_t));
*cpu_infos = (uv_cpu_info_t*)uv__malloc(numcpus * sizeof(uv_cpu_info_t));
if (!*cpu_infos) {
return UV_ENOMEM;
}
@@ -109,4 +109,4 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) {
*count = numcpus;
return 0;
}
}

4
wpiutil/src/main/native/libuv/unix/internal.h
View File

@@ -336,8 +336,8 @@ UV_UNUSED(static void uv__update_time(uv_loop_t* loop)) {
loop->time = uv__hrtime(UV_CLOCK_FAST) / 1000000;
}
UV_UNUSED(static char* uv__basename_r(const char* path)) {
char* s;
UV_UNUSED(static const char* uv__basename_r(const char* path)) {
const char* s;
s = strrchr(path, '/');
if (s == NULL)

4
wpiutil/src/main/native/libuv/unix/kqueue.cpp
View File

@@ -250,8 +250,8 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
nevents = 0;
assert(loop->watchers != NULL);
loop->watchers[loop->nwatchers] = (void*) events;
loop->watchers[loop->nwatchers + 1] = (void*) (uintptr_t) nfds;
loop->watchers[loop->nwatchers] = (uv__io_t*) events;
loop->watchers[loop->nwatchers + 1] = (uv__io_t*) (uintptr_t) nfds;
for (i = 0; i < nfds; i++) {
ev = events + i;
fd = ev->ident;

9
wpiutil/src/main/native/libuv/unix/linux-core.cpp
View File

@@ -340,8 +340,8 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
nevents = 0;
assert(loop->watchers != NULL);
loop->watchers[loop->nwatchers] = (void*) events;
loop->watchers[loop->nwatchers + 1] = (void*) (uintptr_t) nfds;
loop->watchers[loop->nwatchers] = (uv__io_t*) events;
loop->watchers[loop->nwatchers + 1] = (uv__io_t*) (uintptr_t) nfds;
for (i = 0; i < nfds; i++) {
pe = events + i;
fd = pe->data;
@@ -595,7 +595,7 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) {
goto out;
err = UV_ENOMEM;
ci = uv__calloc(numcpus, sizeof(*ci));
ci = (uv_cpu_info_t*)uv__calloc(numcpus, sizeof(*ci));
if (ci == NULL)
goto out;
@@ -879,7 +879,8 @@ int uv_interface_addresses(uv_interface_address_t** addresses,
if (*count == 0)
return 0;
*addresses = uv__malloc(*count * sizeof(**addresses));
*addresses =
(uv_interface_address_t*)uv__malloc(*count * sizeof(**addresses));
if (!(*addresses)) {
freeifaddrs(addrs);
return UV_ENOMEM;

2
wpiutil/src/main/native/libuv/unix/linux-inotify.cpp
View File

@@ -306,7 +306,7 @@ int uv_fs_event_start(uv_fs_event_t* handle,
if (w)
goto no_insert;
w = uv__malloc(sizeof(*w) + strlen(path) + 1);
w = (watcher_list*)uv__malloc(sizeof(*w) + strlen(path) + 1);
if (w == NULL)
return UV_ENOMEM;

4
wpiutil/src/main/native/libuv/unix/netbsd.cpp
View File

@@ -268,14 +268,14 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) {
cpuspeed = 0;
size = numcpus * CPUSTATES * sizeof(*cp_times);
cp_times = uv__malloc(size);
cp_times = (u_int64_t*)uv__malloc(size);
if (cp_times == NULL)
return UV_ENOMEM;
if (sysctlbyname("kern.cp_time", cp_times, &size, NULL, 0))
return UV__ERR(errno);
*cpu_infos = uv__malloc(numcpus * sizeof(**cpu_infos));
*cpu_infos = (uv_cpu_info_t*)uv__malloc(numcpus * sizeof(**cpu_infos));
if (!(*cpu_infos)) {
uv__free(cp_times);
uv__free(*cpu_infos);

4
wpiutil/src/main/native/libuv/unix/openbsd.cpp
View File

@@ -83,7 +83,7 @@ int uv_exepath(char* buffer, size_t* size) {
mypid = getpid();
for (;;) {
err = UV_ENOMEM;
argsbuf_tmp = uv__realloc(argsbuf, argsbuf_size);
argsbuf_tmp = (char**)uv__realloc(argsbuf, argsbuf_size);
if (argsbuf_tmp == NULL)
goto out;
argsbuf = argsbuf_tmp;
@@ -262,7 +262,7 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) {
if (sysctl(which, 2, &numcpus, &size, NULL, 0))
return UV__ERR(errno);
*cpu_infos = uv__malloc(numcpus * sizeof(**cpu_infos));
*cpu_infos = (uv_cpu_info_t*)uv__malloc(numcpus * sizeof(**cpu_infos));
if (!(*cpu_infos))
return UV_ENOMEM;

4
wpiutil/src/main/native/libuv/unix/pipe.cpp
View File

@@ -291,7 +291,7 @@ int uv_pipe_pending_count(uv_pipe_t* handle) {
if (handle->queued_fds == NULL)
return 1;
queued_fds = handle->queued_fds;
queued_fds = (uv__stream_queued_fds_t*)(handle->queued_fds);
return queued_fds->offset + 1;
}
@@ -328,7 +328,7 @@ int uv_pipe_chmod(uv_pipe_t* handle, int mode) {
if (r != UV_ENOBUFS)
return r;
name_buffer = uv__malloc(name_len);
name_buffer = (char*)uv__malloc(name_len);
if (name_buffer == NULL)
return UV_ENOMEM;

2
wpiutil/src/main/native/libuv/unix/posix-poll.cpp
View File

@@ -61,7 +61,7 @@ static void uv__pollfds_maybe_resize(uv_loop_t* loop) {
return;
n = loop->poll_fds_size ? loop->poll_fds_size * 2 : 64;
p = uv__realloc(loop->poll_fds, n * sizeof(*loop->poll_fds));
p = (struct pollfd*)uv__realloc(loop->poll_fds, n * sizeof(*loop->poll_fds));
if (p == NULL)
abort();

2
wpiutil/src/main/native/libuv/unix/process.cpp
View File

@@ -443,7 +443,7 @@ int uv_spawn(uv_loop_t* loop,
err = UV_ENOMEM;
pipes = pipes_storage;
if (stdio_count > (int) ARRAY_SIZE(pipes_storage))
pipes = uv__malloc(stdio_count * sizeof(*pipes));
pipes = (int (*)[2])uv__malloc(stdio_count * sizeof(*pipes));
if (pipes == NULL)
goto error;

2
wpiutil/src/main/native/libuv/unix/proctitle.cpp
View File

@@ -68,7 +68,7 @@ char** uv_setup_args(int argc, char** argv) {
/* Add space for the argv pointers. */
size += (argc + 1) * sizeof(char*);
new_argv = uv__malloc(size);
new_argv = (char**)uv__malloc(size);
if (new_argv == NULL)
return argv;
args_mem = new_argv;

35
wpiutil/src/main/native/libuv/unix/stream.cpp
View File

@@ -118,7 +118,7 @@ static void uv__stream_osx_interrupt_select(uv_stream_t* stream) {
uv__stream_select_t* s;
int r;
s = stream->select;
s = (uv__stream_select_t*)stream->select;
if (s == NULL)
return;
@@ -147,8 +147,8 @@ static void uv__stream_osx_select(void* arg) {
int r;
int max_fd;
stream = arg;
s = stream->select;
stream = (uv_stream_t*)arg;
s = (uv__stream_select_t*)stream->select;
fd = s->fd;
if (fd > s->int_fd)
@@ -325,7 +325,7 @@ int uv__stream_try_select(uv_stream_t* stream, int* fd) {
sread_sz = ROUND_UP(max_fd + 1, sizeof(uint32_t) * NBBY) / NBBY;
swrite_sz = sread_sz;
s = uv__malloc(sizeof(*s) + sread_sz + swrite_sz);
s = (uv__stream_select_t*)uv__malloc(sizeof(*s) + sread_sz + swrite_sz);
if (s == NULL) {
err = UV_ENOMEM;
goto failed_malloc;
@@ -617,7 +617,7 @@ done:
if (server->queued_fds != NULL) {
uv__stream_queued_fds_t* queued_fds;
queued_fds = server->queued_fds;
queued_fds = (uv__stream_queued_fds_t*)(server->queued_fds);
/* Read first */
server->accepted_fd = queued_fds->fds[0];
@@ -825,7 +825,7 @@ start:
/* silence aliasing warning */
{
void* pv = CMSG_DATA(cmsg);
int* pi = pv;
int* pi = (int*)pv;
*pi = fd_to_send;
}
@@ -1029,11 +1029,12 @@ static int uv__stream_queue_fd(uv_stream_t* stream, int fd) {
uv__stream_queued_fds_t* queued_fds;
unsigned int queue_size;
queued_fds = stream->queued_fds;
queued_fds = (uv__stream_queued_fds_t*)stream->queued_fds;
if (queued_fds == NULL) {
queue_size = 8;
queued_fds = uv__malloc((queue_size - 1) * sizeof(*queued_fds->fds) +
sizeof(*queued_fds));
queued_fds = (uv__stream_queued_fds_t*)
uv__malloc((queue_size - 1) * sizeof(*queued_fds->fds) +
sizeof(*queued_fds));
if (queued_fds == NULL)
return UV_ENOMEM;
queued_fds->size = queue_size;
@@ -1043,9 +1044,9 @@ static int uv__stream_queue_fd(uv_stream_t* stream, int fd) {
/* Grow */
} else if (queued_fds->size == queued_fds->offset) {
queue_size = queued_fds->size + 8;
queued_fds = uv__realloc(queued_fds,
(queue_size - 1) * sizeof(*queued_fds->fds) +
sizeof(*queued_fds));
queued_fds = (uv__stream_queued_fds_t*)
uv__realloc(queued_fds, (queue_size - 1) * sizeof(*queued_fds->fds) +
sizeof(*queued_fds));
/*
* Allocation failure, report back.
@@ -1088,7 +1089,7 @@ static int uv__stream_recv_cmsg(uv_stream_t* stream, struct msghdr* msg) {
/* silence aliasing warning */
pv = CMSG_DATA(cmsg);
pi = pv;
pi = (int*)pv;
/* Count available fds */
start = (char*) cmsg;
@@ -1459,7 +1460,7 @@ int uv_write2(uv_write_t* req,
req->bufs = req->bufsml;
if (nbufs > ARRAY_SIZE(req->bufsml))
req->bufs = uv__malloc(nbufs * sizeof(bufs[0]));
req->bufs = (uv_buf_t*)uv__malloc(nbufs * sizeof(bufs[0]));
if (req->bufs == NULL)
return UV_ENOMEM;
@@ -1632,7 +1633,7 @@ int uv___stream_fd(const uv_stream_t* handle) {
handle->type == UV_TTY ||
handle->type == UV_NAMED_PIPE);
s = handle->select;
s = (const uv__stream_select_t*)handle->select;
if (s != NULL)
return s->fd;
@@ -1650,7 +1651,7 @@ void uv__stream_close(uv_stream_t* handle) {
if (handle->select != NULL) {
uv__stream_select_t* s;
s = handle->select;
s = (uv__stream_select_t*)handle->select;
uv_sem_post(&s->close_sem);
uv_sem_post(&s->async_sem);
@@ -1684,7 +1685,7 @@ void uv__stream_close(uv_stream_t* handle) {
/* Close all queued fds */
if (handle->queued_fds != NULL) {
queued_fds = handle->queued_fds;
queued_fds = (uv__stream_queued_fds_t*)(handle->queued_fds);
for (i = 0; i < queued_fds->offset; i++)
uv__close(queued_fds->fds[i]);
uv__free(handle->queued_fds);

4
wpiutil/src/main/native/libuv/unix/thread.cpp
View File

@@ -59,7 +59,7 @@ int pthread_barrier_init(pthread_barrier_t* barrier,
if (barrier_attr != NULL)
return ENOTSUP;
b = uv__malloc(sizeof(*b));
b = (_uv_barrier*)uv__malloc(sizeof(*b));
if (b == NULL)
return ENOMEM;
@@ -469,7 +469,7 @@ static int uv__custom_sem_init(uv_sem_t* sem_, unsigned int value) {
int err;
uv_semaphore_t* sem;
sem = uv__malloc(sizeof(*sem));
sem = (uv_semaphore_t*)uv__malloc(sizeof(*sem));
if (sem == NULL)
return UV_ENOMEM;

4
wpiutil/src/main/native/libuv/unix/udp.cpp
View File

@@ -177,7 +177,7 @@ static void uv__udp_recvmsg(uv_udp_t* handle) {
assert(buf.base != NULL);
h.msg_namelen = sizeof(peer);
h.msg_iov = (void*) &buf;
h.msg_iov = (iovec*) &buf;
h.msg_iovlen = 1;
do {
@@ -414,7 +414,7 @@ int uv__udp_send(uv_udp_send_t* req,
req->bufs = req->bufsml;
if (nbufs > ARRAY_SIZE(req->bufsml))
req->bufs = uv__malloc(nbufs * sizeof(bufs[0]));
req->bufs = (uv_buf_t*)uv__malloc(nbufs * sizeof(bufs[0]));
if (req->bufs == NULL) {
uv__req_unregister(handle->loop, req);

14
wpiutil/src/main/native/libuv/uv-common.cpp
View File

@@ -53,10 +53,10 @@ static uv__allocator_t uv__allocator = {
char* uv__strdup(const char* s) {
size_t len = strlen(s) + 1;
char* m = uv__malloc(len);
char* m = (char*)uv__malloc(len);
if (m == NULL)
return NULL;
return memcpy(m, s, len);
return (char*)memcpy(m, s, len);
}
char* uv__strndup(const char* s, size_t n) {
@@ -64,11 +64,11 @@ char* uv__strndup(const char* s, size_t n) {
size_t len = strlen(s);
if (n < len)
len = n;
m = uv__malloc(len + 1);
m = (char*)uv__malloc(len + 1);
if (m == NULL)
return NULL;
m[len] = '\0';
return memcpy(m, s, len);
return (char*)memcpy(m, s, len);
}
void* uv__malloc(size_t size) {
@@ -498,7 +498,7 @@ void uv__fs_scandir_cleanup(uv_fs_t* req) {
unsigned int* nbufs = uv__get_nbufs(req);
dents = req->ptr;
dents = (uv__dirent_t**)(req->ptr);
if (*nbufs > 0 && *nbufs != (unsigned int) req->result)
(*nbufs)--;
for (; *nbufs < (unsigned int) req->result; (*nbufs)++)
@@ -525,7 +525,7 @@ int uv_fs_scandir_next(uv_fs_t* req, uv_dirent_t* ent) {
nbufs = uv__get_nbufs(req);
assert(nbufs);
dents = req->ptr;
dents = (uv__dirent_t**)(req->ptr);
/* Free previous entity */
if (*nbufs > 0)
@@ -607,7 +607,7 @@ uv_loop_t* uv_default_loop(void) {
uv_loop_t* uv_loop_new(void) {
uv_loop_t* loop;
loop = uv__malloc(sizeof(*loop));
loop = (uv_loop_t*)uv__malloc(sizeof(*loop));
if (loop == NULL)
return NULL;

6
wpiutil/src/main/native/libuv/win/core.cpp
View File

@@ -95,7 +95,8 @@ static int uv__loops_add(uv_loop_t* loop) {
if (uv__loops_size == uv__loops_capacity) {
new_capacity = uv__loops_capacity + UV__LOOPS_CHUNK_SIZE;
new_loops = uv__realloc(uv__loops, sizeof(uv_loop_t*) * new_capacity);
new_loops = (uv_loop_t**)
uv__realloc(uv__loops, sizeof(uv_loop_t*) * new_capacity);
if (!new_loops)
goto failed_loops_realloc;
uv__loops = new_loops;
@@ -148,7 +149,8 @@ static void uv__loops_remove(uv_loop_t* loop) {
smaller_capacity = uv__loops_capacity / 2;
if (uv__loops_size >= smaller_capacity)
goto loop_removed;
new_loops = uv__realloc(uv__loops, sizeof(uv_loop_t*) * smaller_capacity);
new_loops = (uv_loop_t**)
uv__realloc(uv__loops, sizeof(uv_loop_t*) * smaller_capacity);
if (!new_loops)
goto loop_removed;
uv__loops = new_loops;

2
wpiutil/src/main/native/libuv/win/fs-event.cpp
View File

@@ -73,7 +73,7 @@ static void uv_relative_path(const WCHAR* filename,
if (dirlen > 0 && dir[dirlen - 1] == '\\')
dirlen--;
relpathlen = filenamelen - dirlen - 1;
*relpath = uv__malloc((relpathlen + 1) * sizeof(WCHAR));
*relpath = (WCHAR*)uv__malloc((relpathlen + 1) * sizeof(WCHAR));
if (!*relpath)
uv_fatal_error(ERROR_OUTOFMEMORY, "uv__malloc");
wcsncpy(*relpath, filename + dirlen + 1, relpathlen);

12
wpiutil/src/main/native/libuv/win/fs.cpp
View File

@@ -277,7 +277,7 @@ static int fs__wide_to_utf8(WCHAR* w_source_ptr,
return 0;
}
target = uv__malloc(target_len + 1);
target = (char*)uv__malloc(target_len + 1);
if (target == NULL) {
SetLastError(ERROR_OUTOFMEMORY);
return -1;
@@ -984,7 +984,7 @@ void fs__scandir(uv_fs_t* req) {
if (dirents_used >= dirents_size) {
size_t new_dirents_size =
dirents_size == 0 ? dirents_initial_size : dirents_size << 1;
uv__dirent_t** new_dirents =
uv__dirent_t** new_dirents = (uv__dirent_t**)
uv__realloc(dirents, new_dirents_size * sizeof *dirents);
if (new_dirents == NULL)
@@ -998,7 +998,7 @@ void fs__scandir(uv_fs_t* req) {
* includes room for the first character of the filename, but `utf8_len`
* doesn't count the NULL terminator at this point.
*/
dirent = uv__malloc(sizeof *dirent + utf8_len);
dirent = (uv__dirent_t*)uv__malloc(sizeof *dirent + utf8_len);
if (dirent == NULL)
goto out_of_memory_error;
@@ -1897,7 +1897,7 @@ static size_t fs__realpath_handle(HANDLE handle, char** realpath_ptr) {
return -1;
}
w_realpath_buf = uv__malloc((w_realpath_len + 1) * sizeof(WCHAR));
w_realpath_buf = (WCHAR*)uv__malloc((w_realpath_len + 1) * sizeof(WCHAR));
if (w_realpath_buf == NULL) {
SetLastError(ERROR_OUTOFMEMORY);
return -1;
@@ -2104,7 +2104,7 @@ int uv_fs_read(uv_loop_t* loop,
req->fs.info.nbufs = nbufs;
req->fs.info.bufs = req->fs.info.bufsml;
if (nbufs > ARRAY_SIZE(req->fs.info.bufsml))
req->fs.info.bufs = uv__malloc(nbufs * sizeof(*bufs));
req->fs.info.bufs = (uv_buf_t*)uv__malloc(nbufs * sizeof(*bufs));
if (req->fs.info.bufs == NULL)
return UV_ENOMEM;
@@ -2133,7 +2133,7 @@ int uv_fs_write(uv_loop_t* loop,
req->fs.info.nbufs = nbufs;
req->fs.info.bufs = req->fs.info.bufsml;
if (nbufs > ARRAY_SIZE(req->fs.info.bufsml))
req->fs.info.bufs = uv__malloc(nbufs * sizeof(*bufs));
req->fs.info.bufs = (uv_buf_t*)uv__malloc(nbufs * sizeof(*bufs));
if (req->fs.info.bufs == NULL)
return UV_ENOMEM;

9
wpiutil/src/main/native/libuv/win/pipe.cpp
View File

@@ -1259,7 +1259,7 @@ static int uv__build_coalesced_write_req(uv_write_t* user_req,
data_length; /* (c) */
/* Allocate buffer. */
heap_buffer = uv__malloc(heap_buffer_length);
heap_buffer = (char*)uv__malloc(heap_buffer_length);
if (heap_buffer == NULL)
return ERROR_NOT_ENOUGH_MEMORY; /* Maps to UV_ENOMEM. */
@@ -1504,7 +1504,7 @@ int uv__pipe_write_ipc(uv_loop_t* loop,
bufs = stack_bufs;
} else {
/* Use heap-allocated buffer array. */
bufs = uv__calloc(buf_count, sizeof(uv_buf_t));
bufs = (uv_buf_t*)uv__calloc(buf_count, sizeof(uv_buf_t));
if (bufs == NULL)
return ERROR_NOT_ENOUGH_MEMORY; /* Maps to UV_ENOMEM. */
}
@@ -1675,7 +1675,8 @@ static DWORD uv__pipe_read_data(uv_loop_t* loop,
static DWORD uv__pipe_read_ipc(uv_loop_t* loop, uv_pipe_t* handle) {
DWORD* data_remaining = &handle->pipe.conn.ipc_data_frame.payload_remaining;
DWORD* data_remaining =
(DWORD*)&handle->pipe.conn.ipc_data_frame.payload_remaining;
int err;
if (*data_remaining > 0) {
@@ -2130,7 +2131,7 @@ static int uv__pipe_getname(const uv_pipe_t* handle, char* buffer, size_t* size)
FileNameInformation);
if (nt_status == STATUS_BUFFER_OVERFLOW) {
name_size = sizeof(*name_info) + tmp_name_info.FileNameLength;
name_info = uv__malloc(name_size);
name_info = (FILE_NAME_INFORMATION*)uv__malloc(name_size);
if (!name_info) {
*size = 0;
err = UV_ENOMEM;

15
wpiutil/src/main/native/libuv/win/process.cpp
View File

@@ -615,8 +615,8 @@ error:
int env_strncmp(const wchar_t* a, int na, const wchar_t* b) {
wchar_t* a_eq;
wchar_t* b_eq;
const wchar_t* a_eq;
const wchar_t* b_eq;
wchar_t* A;
wchar_t* B;
int nb;
@@ -633,8 +633,8 @@ int env_strncmp(const wchar_t* a, int na, const wchar_t* b) {
assert(b_eq);
nb = b_eq - b;
A = alloca((na+1) * sizeof(wchar_t));
B = alloca((nb+1) * sizeof(wchar_t));
A = (wchar_t*)alloca((na+1) * sizeof(wchar_t));
B = (wchar_t*)alloca((nb+1) * sizeof(wchar_t));
r = LCMapStringW(LOCALE_INVARIANT, LCMAP_UPPERCASE, a, na, A, na);
assert(r==na);
@@ -692,7 +692,8 @@ int make_program_env(char* env_block[], WCHAR** dst_ptr) {
WCHAR* dst_copy;
WCHAR** ptr_copy;
WCHAR** env_copy;
DWORD* required_vars_value_len = alloca(n_required_vars * sizeof(DWORD*));
DWORD* required_vars_value_len =
(DWORD*)alloca(n_required_vars * sizeof(DWORD*));
/* first pass: determine size in UTF-16 */
for (env = env_block; *env; env++) {
@@ -717,7 +718,7 @@ int make_program_env(char* env_block[], WCHAR** dst_ptr) {
if (!dst_copy) {
return ERROR_OUTOFMEMORY;
}
env_copy = alloca(env_block_count * sizeof(WCHAR*));
env_copy = (WCHAR**)alloca(env_block_count * sizeof(WCHAR*));
ptr = dst_copy;
ptr_copy = env_copy;
@@ -771,7 +772,7 @@ int make_program_env(char* env_block[], WCHAR** dst_ptr) {
}
/* final pass: copy, in sort order, and inserting required variables */
dst = uv__malloc((1+env_len) * sizeof(WCHAR));
dst = (WCHAR*)uv__malloc((1+env_len) * sizeof(WCHAR));
if (!dst) {
uv__free(dst_copy);
return ERROR_OUTOFMEMORY;

4
wpiutil/src/main/native/libuv/win/thread.cpp
View File

@@ -101,7 +101,7 @@ static UINT __stdcall uv__thread_start(void* arg) {
struct thread_ctx *ctx_p;
struct thread_ctx ctx;
ctx_p = arg;
ctx_p = (struct thread_ctx*)arg;
ctx = *ctx_p;
uv__free(ctx_p);
@@ -119,7 +119,7 @@ int uv_thread_create(uv_thread_t *tid, void (*entry)(void *arg), void *arg) {
int err;
HANDLE thread;
ctx = uv__malloc(sizeof(*ctx));
ctx = (struct thread_ctx*)uv__malloc(sizeof(*ctx));
if (ctx == NULL)
return UV_ENOMEM;

2
wpiutil/src/main/native/libuv/win/tty.cpp
View File

@@ -1677,7 +1677,7 @@ static int uv_tty_write_bufs(uv_tty_t* handle,
max_len = (utf16_buf_used + 1) * sizeof(WCHAR);
allocate = max_len > MAX_CONSOLE_CHAR;
if (allocate)
utf16_buffer = uv__malloc(max_len);
utf16_buffer = (WCHAR*)uv__malloc(max_len);
if (!MultiByteToWideChar(CP_UTF8,
0,
buf.base,

15
wpiutil/src/main/native/libuv/win/util.cpp
View File

@@ -618,14 +618,14 @@ int uv_cpu_info(uv_cpu_info_t** cpu_infos_ptr, int* cpu_count_ptr) {
GetSystemInfo(&system_info);
cpu_count = system_info.dwNumberOfProcessors;
cpu_infos = uv__calloc(cpu_count, sizeof *cpu_infos);
cpu_infos = (uv_cpu_info_t*)uv__calloc(cpu_count, sizeof *cpu_infos);
if (cpu_infos == NULL) {
err = ERROR_OUTOFMEMORY;
goto error;
}
sppi_size = cpu_count * sizeof(*sppi);
sppi = uv__malloc(sppi_size);
sppi = (SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION*)uv__malloc(sppi_size);
if (sppi == NULL) {
err = ERROR_OUTOFMEMORY;
goto error;
@@ -856,7 +856,8 @@ int uv_interface_addresses(uv_interface_address_t** addresses_ptr,
case ERROR_BUFFER_OVERFLOW:
/* This happens when win_address_buf is NULL or too small to hold all
* adapters. */
win_address_buf = uv__malloc(win_address_buf_size);
win_address_buf =
(IP_ADAPTER_ADDRESSES*)uv__malloc(win_address_buf_size);
if (win_address_buf == NULL)
return UV_ENOMEM;
@@ -864,7 +865,7 @@ int uv_interface_addresses(uv_interface_address_t** addresses_ptr,
case ERROR_NO_DATA: {
/* No adapters were found. */
uv_address_buf = uv__malloc(1);
uv_address_buf = (uv_interface_address_t*)uv__malloc(1);
if (uv_address_buf == NULL)
return UV_ENOMEM;
@@ -941,7 +942,7 @@ int uv_interface_addresses(uv_interface_address_t** addresses_ptr,
}
/* Allocate space to store interface data plus adapter names. */
uv_address_buf = uv__malloc(uv_address_buf_size);
uv_address_buf = (uv_interface_address_t*)uv__malloc(uv_address_buf_size);
if (uv_address_buf == NULL) {
uv__free(win_address_buf);
return UV_ENOMEM;
@@ -1263,7 +1264,7 @@ int uv__convert_utf16_to_utf8(const WCHAR* utf16, int utf16len, char** utf8) {
/* Allocate the destination buffer adding an extra byte for the terminating
* NULL. If utf16len is not -1 WideCharToMultiByte will not add it, so
* we do it ourselves always, just in case. */
*utf8 = uv__malloc(bufsize + 1);
*utf8 = (char*)uv__malloc(bufsize + 1);
if (*utf8 == NULL)
return UV_ENOMEM;
@@ -1311,7 +1312,7 @@ int uv__convert_utf8_to_utf16(const char* utf8, int utf8len, WCHAR** utf16) {
/* Allocate the destination buffer adding an extra byte for the terminating
* NULL. If utf8len is not -1 MultiByteToWideChar will not add it, so
* we do it ourselves always, just in case. */
*utf16 = uv__malloc(sizeof(WCHAR) * (bufsize + 1));
*utf16 = (WCHAR*)uv__malloc(sizeof(WCHAR) * (bufsize + 1));
if (*utf16 == NULL)
return UV_ENOMEM;