chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hashmap: fix iterators to not skip entries
[elogind.git]
/
src
/
shared
/
fdset.c
diff --git
a/src/shared/fdset.c
b/src/shared/fdset.c
index 31849272bd314e165d9937354c3cba97e84978bf..a4823e6659623602d71227929e797d83d87e38ef 100644
(file)
--- a/
src/shared/fdset.c
+++ b/
src/shared/fdset.c
@@
-32,7
+32,7
@@
#define MAKE_SET(s) ((Set*) s)
#define MAKE_FDSET(s) ((FDSet*) s)
#define MAKE_SET(s) ((Set*) s)
#define MAKE_FDSET(s) ((FDSet*) s)
-/* Make sure we can dist
uing
ish fd 0 and NULL */
+/* Make sure we can dist
ingu
ish fd 0 and NULL */
#define FD_TO_PTR(fd) INT_TO_PTR((fd)+1)
#define PTR_TO_FD(p) (PTR_TO_INT(p)-1)
#define FD_TO_PTR(fd) INT_TO_PTR((fd)+1)
#define PTR_TO_FD(p) (PTR_TO_INT(p)-1)
@@
-267,8
+267,7
@@
bool fdset_isempty(FDSet *fds) {
int fdset_iterate(FDSet *s, Iterator *i) {
void *p;
int fdset_iterate(FDSet *s, Iterator *i) {
void *p;
- p = set_iterate(MAKE_SET(s), i);
- if (!p)
+ if (!set_iterate(MAKE_SET(s), i, &p))
return -ENOENT;
return PTR_TO_FD(p);
return -ENOENT;
return PTR_TO_FD(p);