#define MINIMUM_SIZE 8
/* If we're in the regression tests, force reallocation to happen sooner */
-#ifdef DBUS_BUILD_TESTS
+#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#define DEFAULT_SIZE_HINT 1
#else
#define DEFAULT_SIZE_HINT MINIMUM_SIZE
static dbus_bool_t
socket_set_poll_add (DBusSocketSet *set,
- int fd,
+ DBusPollable fd,
unsigned int flags,
dbus_bool_t enabled)
{
int i;
for (i = 0; i < self->n_fds; i++)
- _dbus_assert (self->fds[i].fd != fd);
+ _dbus_assert (!_dbus_pollable_equals (self->fds[i].fd, fd));
#endif
if (self->n_reserved >= self->n_allocated)
self->n_allocated += REALLOC_INCREMENT;
}
- _dbus_verbose ("before adding fd %d to %p, %d en/%d res/%d alloc\n",
- fd, self, self->n_fds, self->n_reserved, self->n_allocated);
+ _dbus_verbose ("before adding fd %" DBUS_POLLABLE_FORMAT " to %p, %d en/%d res/%d alloc\n",
+ _dbus_pollable_printable (fd), self, self->n_fds, self->n_reserved, self->n_allocated);
_dbus_assert (self->n_reserved >= self->n_fds);
_dbus_assert (self->n_allocated > self->n_reserved);
static void
socket_set_poll_enable (DBusSocketSet *set,
- int fd,
+ DBusPollable fd,
unsigned int flags)
{
DBusSocketSetPoll *self = socket_set_poll_cast (set);
for (i = 0; i < self->n_fds; i++)
{
- if (self->fds[i].fd == fd)
+ if (_dbus_pollable_equals (self->fds[i].fd, fd))
{
self->fds[i].events = watch_flags_to_poll_events (flags);
return;
static void
socket_set_poll_disable (DBusSocketSet *set,
- int fd)
+ DBusPollable fd)
{
DBusSocketSetPoll *self = socket_set_poll_cast (set);
int i;
for (i = 0; i < self->n_fds; i++)
{
- if (self->fds[i].fd == fd)
+ if (_dbus_pollable_equals (self->fds[i].fd, fd))
{
if (i != self->n_fds - 1)
{
static void
socket_set_poll_remove (DBusSocketSet *set,
- int fd)
+ DBusPollable fd)
{
DBusSocketSetPoll *self = socket_set_poll_cast (set);
socket_set_poll_disable (set, fd);
self->n_reserved--;
- _dbus_verbose ("after removing fd %d from %p, %d en/%d res/%d alloc\n",
- fd, self, self->n_fds, self->n_reserved, self->n_allocated);
+ _dbus_verbose ("after removing fd %" DBUS_POLLABLE_FORMAT " from %p, %d en/%d res/%d alloc\n",
+ _dbus_pollable_printable (fd), self, self->n_fds, self->n_reserved, self->n_allocated);
_dbus_assert (self->n_fds <= self->n_reserved);
_dbus_assert (self->n_reserved <= self->n_allocated);