dbus-marshal-validate: Check brackets in signature nest correctly

[platform/upstream/dbus.git] / dbus / dbus-socket-set-poll.c

diff --git a/dbus/dbus-socket-set-poll.c b/dbus/dbus-socket-set-poll.c
index e322a3b..623e28f 100644 (file)
--- a/dbus/dbus-socket-set-poll.c
+++ b/dbus/dbus-socket-set-poll.c
@@ -114,7 +114,7 @@ watch_flags_to_poll_events (unsigned int flags)
 
 static dbus_bool_t
 socket_set_poll_add (DBusSocketSet  *set,
-                     int             fd,
+                     DBusPollable    fd,
                      unsigned int    flags,
                      dbus_bool_t     enabled)
 {
@@ -123,7 +123,7 @@ socket_set_poll_add (DBusSocketSet  *set,
   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)
@@ -142,8 +142,8 @@ socket_set_poll_add (DBusSocketSet  *set,
       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);
 
@@ -161,7 +161,7 @@ socket_set_poll_add (DBusSocketSet  *set,
 
 static void
 socket_set_poll_enable (DBusSocketSet *set,
-                        int            fd,
+                        DBusPollable   fd,
                         unsigned int   flags)
 {
   DBusSocketSetPoll *self = socket_set_poll_cast (set);
@@ -169,7 +169,7 @@ socket_set_poll_enable (DBusSocketSet *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;
@@ -187,14 +187,14 @@ socket_set_poll_enable (DBusSocketSet *set,
 
 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)
             {
@@ -210,15 +210,15 @@ socket_set_poll_disable (DBusSocketSet *set,
 
 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);