RPCS3/libusb
1
0
Fork 0
mirror of https://github.com/RPCS3/libusb.git synced 2026-07-21 00:16:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

core: Rename count variable for pollfds for consistency with other count variables

Browse Source 
Signed-off-by: Chris Dickens <chris.dickens@hp.com>
This commit is contained in:
Chris Dickens
2014-08-29 15:38:49 -07:00
parent 8c60a6716d
commit 3c323dc36e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libusb/io.c
+7 -7
View File
@@ -1998,9 +1998,9 @@ static int handle_events(struct libusb_context *ctx, struct timeval *tv)
/* sanity check - it is invalid for a context to have fewer than the
* required internal fds (memory corruption?) */
assert(ctx->num_pollfds >= internal_nfds);
assert(ctx->pollfds_cnt >= internal_nfds);
ctx->pollfds = calloc(ctx->num_pollfds, sizeof(*ctx->pollfds));
ctx->pollfds = calloc(ctx->pollfds_cnt, sizeof(*ctx->pollfds));
if (!ctx->pollfds) {
usbi_mutex_unlock(&ctx->pollfds_lock);
return LIBUSB_ERROR_NO_MEM;
@@ -2017,7 +2017,7 @@ static int handle_events(struct libusb_context *ctx, struct timeval *tv)
ctx->pollfds_modified = 0;
}
fds = ctx->pollfds;
nfds = ctx->num_pollfds;
nfds = ctx->pollfds_cnt;
usbi_mutex_unlock(&ctx->pollfds_lock);
timeout_ms = (int)(tv->tv_sec * 1000) + (tv->tv_usec / 1000);
@@ -2490,7 +2490,7 @@ int usbi_add_pollfd(struct libusb_context *ctx, int fd, short events)
ipollfd->pollfd.events = events;
usbi_mutex_lock(&ctx->pollfds_lock);
list_add_tail(&ipollfd->list, &ctx->ipollfds);
ctx->num_pollfds++;
ctx->pollfds_cnt++;
ctx->pollfds_modified = 1;
usbi_mutex_unlock(&ctx->pollfds_lock);
@@ -2520,7 +2520,7 @@ void usbi_remove_pollfd(struct libusb_context *ctx, int fd)
}
list_del(&ipollfd->list);
ctx->num_pollfds--;
ctx->pollfds_cnt--;
ctx->pollfds_modified = 1;
usbi_mutex_unlock(&ctx->pollfds_lock);
free(ipollfd);
@@ -2555,13 +2555,13 @@ const struct libusb_pollfd ** LIBUSB_CALL libusb_get_pollfds(
usbi_mutex_lock(&ctx->pollfds_lock);
ret = calloc(ctx->num_pollfds + 1, sizeof(struct libusb_pollfd *));
ret = calloc(ctx->pollfds_cnt + 1, sizeof(struct libusb_pollfd *));
if (!ret)
goto out;
list_for_each_entry(ipollfd, &ctx->ipollfds, list, struct usbi_pollfd)
ret[i++] = (struct libusb_pollfd *) ipollfd;
ret[ctx->num_pollfds] = NULL;
ret[ctx->pollfds_cnt] = NULL;
out:
usbi_mutex_unlock(&ctx->pollfds_lock);
libusb/libusbi.h
+1 -1
View File
@@ -269,8 +269,8 @@ struct libusb_context {
* (re)allocated as necessary prior to polling, and a flag to indicate
* when the list of poll fds has changed since the last poll. */
struct list_head ipollfds;
POLL_NFDS_TYPE num_pollfds;
struct pollfd *pollfds;
POLL_NFDS_TYPE pollfds_cnt;
unsigned int pollfds_modified;
usbi_mutex_t pollfds_lock;