sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some warnings

Browse Source
This commit is contained in:
Gregory Nutt 2016-07-16 07:02:06 -06:00
parent bcb6095f1f
commit 11fe9378df
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
fs/vfs/fs_epoll.c
View File

@ -44,10 +44,11 @@
#include <stdint.h> #include <stdint.h>
#include <poll.h> #include <poll.h>
#include <errno.h> #include <errno.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <debug.h> #include <debug.h>
#include <nuttx/kmalloc.h>
#ifndef CONFIG_DISABLE_POLL #ifndef CONFIG_DISABLE_POLL
/**************************************************************************** /****************************************************************************
@ -68,13 +69,17 @@
int epoll_create(int size) int epoll_create(int size)
{ {
FAR struct epoll_head *eph = FAR struct epoll_head *eph =
(FAR struct epoll_head *)malloc(sizeof(struct epoll_head)); (FAR struct epoll_head *)kmm_malloc(sizeof(struct epoll_head));
eph->size = size; eph->size = size;
eph->occupied = 0; eph->occupied = 0;
eph->evs = malloc(sizeof(struct epoll_event) * eph->size); eph->evs = kmm_malloc(sizeof(struct epoll_event) * eph->size);
return (int)eph; /* REVISIT: This will not work on machines where:
* sizeof(struct epoll_head *) > sizeof(int)
*/
return (int)((intptr_t)eph);
} }
/**************************************************************************** /****************************************************************************
@ -90,10 +95,14 @@ int epoll_create(int size)
void epoll_close(int epfd) void epoll_close(int epfd)
{ {
struct epoll_head *eph = (struct epoll_head *)epfd; /* REVISIT: This will not work on machines where:
* sizeof(struct epoll_head *) > sizeof(int)
*/
free(eph->evs); FAR struct epoll_head *eph = (FAR struct epoll_head *)((intptr_t)epfd);
free(eph);
kmm_free(eph->evs);
kmm_free(eph);
} }
/**************************************************************************** /****************************************************************************
@ -109,7 +118,11 @@ void epoll_close(int epfd)
int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev) int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev)
{ {
FAR struct epoll_head *eph = (FAR struct epoll_head *)epfd; /* REVISIT: This will not work on machines where:
* sizeof(struct epoll_head *) > sizeof(int)
*/
FAR struct epoll_head *eph = (FAR struct epoll_head *)((intptr_t)epfd);
switch (op) switch (op)
{ {
@ -180,9 +193,13 @@ int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev)
int epoll_wait(int epfd, FAR struct epoll_event *evs, int maxevents, int epoll_wait(int epfd, FAR struct epoll_event *evs, int maxevents,
int timeout) int timeout)
{ {
int i; /* REVISIT: This will not work on machines where:
* sizeof(struct epoll_head *) > sizeof(int)
*/
FAR struct epoll_head *eph = (FAR struct epoll_head *)((intptr_t)epfd);
int rc; int rc;
FAR struct epoll_head *eph = (FAR struct epoll_head *)epfd; int i;
rc = poll((FAR struct pollfd *)eph->evs, eph->occupied, timeout); rc = poll((FAR struct pollfd *)eph->evs, eph->occupied, timeout);