projects
/
yaz-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1d373de
)
yaz_poll: Allow num_fds == 0
author
Adam Dickmeiss
<adam@indexdata.dk>
Tue, 21 Aug 2012 13:05:52 +0000
(15:05 +0200)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Tue, 21 Aug 2012 13:05:52 +0000
(15:05 +0200)
src/poll.c
patch
|
blob
|
history
diff --git
a/src/poll.c
b/src/poll.c
index
9ead1bd
..
cbdd754
100644
(file)
--- a/
src/poll.c
+++ b/
src/poll.c
@@
-60,7
+60,7
@@
int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
FD_ZERO(&output);
FD_ZERO(&except);
FD_ZERO(&output);
FD_ZERO(&except);
- assert(num_fds > 0);
+ assert(num_fds >= 0);
for (i = 0; i < num_fds; i++)
{
enum yaz_poll_mask mask = fds[i].input_mask;
for (i = 0; i < num_fds; i++)
{
enum yaz_poll_mask mask = fds[i].input_mask;
@@
-108,12
+108,13
@@
int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
#if HAVE_SYS_POLL_H
int yaz_poll_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
{
#if HAVE_SYS_POLL_H
int yaz_poll_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
{
- int r;
- struct pollfd *pollfds = (struct pollfd *)
- xmalloc(num_fds * sizeof *pollfds);
- int i;
+ int i, r;
+ struct pollfd *pollfds = 0;
+
+ if (num_fds > 0)
+ pollfds = (struct pollfd *) xmalloc(num_fds * sizeof *pollfds);
- assert(num_fds > 0);
+ assert(num_fds >= 0);
for (i = 0; i < num_fds; i++)
{
enum yaz_poll_mask mask = fds[i].input_mask;
for (i = 0; i < num_fds; i++)
{
enum yaz_poll_mask mask = fds[i].input_mask;