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

Rename file_poll as fdesc_poll. The file_ namespace is used for other things.

Browse Source
This commit is contained in:
Gregory Nutt 2016-07-15 11:21:11 -06:00
parent f7f7036db8
commit 6e6c04f778
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/vfs/fs_poll.c
View File

@ -121,7 +121,7 @@ static int poll_fdsetup(int fd, FAR struct pollfd *fds, bool setup)
}
}
return file_poll(fd, fds, setup);
return fdesc_poll(fd, fds, setup);
}
#endif
@ -244,7 +244,7 @@ static inline int poll_teardown(FAR struct pollfd *fds, nfds_t nfds, int *count,
****************************************************************************/
/****************************************************************************
* Function: file_poll
* Function: fdesc_poll
*
* Description:
* The standard poll() operation redirects operations on file descriptors
@ -262,7 +262,7 @@ static inline int poll_teardown(FAR struct pollfd *fds, nfds_t nfds, int *count,
****************************************************************************/
#if CONFIG_NFILE_DESCRIPTORS > 0
int file_poll(int fd, FAR struct pollfd *fds, bool setup)
int fdesc_poll(int fd, FAR struct pollfd *fds, bool setup)
{
FAR struct file *filep;
FAR struct inode *inode;

4
include/nuttx/fs/fs.h
View File

@ -930,7 +930,7 @@ int file_vfcntl(FAR struct file *filep, int cmd, va_list ap);
#endif
/****************************************************************************
* Function: file_poll
* Function: fdesc_poll
*
* Description:
* The standard poll() operation redirects operations on file descriptors
@ -948,7 +948,7 @@ int file_vfcntl(FAR struct file *filep, int cmd, va_list ap);
****************************************************************************/
#if CONFIG_NFILE_DESCRIPTORS > 0
int file_poll(int fd, FAR struct pollfd *fds, bool setup);
int fdesc_poll(int fd, FAR struct pollfd *fds, bool setup);
#endif
/****************************************************************************

18
net/local/local_netpoll.c
View File

@ -233,13 +233,13 @@ int local_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds)
/* Setup poll for both shadow pollfds. */
ret = file_poll(conn->lc_infd, &shadowfds[0], true);
ret = fdesc_poll(conn->lc_infd, &shadowfds[0], true);
if (ret >= 0)
{
ret = file_poll(conn->lc_outfd, &shadowfds[1], true);
ret = fdesc_poll(conn->lc_outfd, &shadowfds[1], true);
if (ret < 0)
{
(void)file_poll(conn->lc_infd, &shadowfds[0], false);
(void)fdesc_poll(conn->lc_infd, &shadowfds[0], false);
}
}
@ -267,7 +267,7 @@ int local_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds)
goto pollerr;
}
ret = file_poll(conn->lc_infd, fds, true);
ret = fdesc_poll(conn->lc_infd, fds, true);
}
break;
@ -281,7 +281,7 @@ int local_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds)
goto pollerr;
}
ret = file_poll(conn->lc_outfd, fds, true);
ret = fdesc_poll(conn->lc_outfd, fds, true);
}
break;
@ -356,13 +356,13 @@ int local_pollteardown(FAR struct socket *psock, FAR struct pollfd *fds)
/* Teardown for both shadow pollfds. */
ret = file_poll(conn->lc_infd, &shadowfds[0], false);
ret = fdesc_poll(conn->lc_infd, &shadowfds[0], false);
if (ret < 0)
{
status = ret;
}
ret = file_poll(conn->lc_outfd, &shadowfds[1], false);
ret = fdesc_poll(conn->lc_outfd, &shadowfds[1], false);
if (ret < 0)
{
status = ret;
@ -381,7 +381,7 @@ int local_pollteardown(FAR struct socket *psock, FAR struct pollfd *fds)
return OK;
}
status = file_poll(conn->lc_infd, fds, false);
status = fdesc_poll(conn->lc_infd, fds, false);
}
break;
@ -392,7 +392,7 @@ int local_pollteardown(FAR struct socket *psock, FAR struct pollfd *fds)
return OK;
}
status = file_poll(conn->lc_outfd, fds, false);
status = fdesc_poll(conn->lc_outfd, fds, false);
}
break;