First bugfixes

Now we can at least successfully register.
This commit is contained in:
2014-07-15 23:28:00 +02:00
parent c419946729
commit 996e0912c2
2 changed files with 14 additions and 9 deletions

View File

@@ -519,7 +519,7 @@ error_set (struct error **e, const char *message, ...)
va_list ap;
va_start (ap, message);
int size = snprintf (NULL, 0, message, ap);
int size = vsnprintf (NULL, 0, message, ap);
va_end (ap);
hard_assert (size >= 0);
@@ -528,7 +528,7 @@ error_set (struct error **e, const char *message, ...)
tmp->message = xmalloc (size + 1);
va_start (ap, message);
size = snprintf (tmp->message, size + 1, message, ap);
size = vsnprintf (tmp->message, size + 1, message, ap);
va_end (ap);
hard_assert (size >= 0);
@@ -579,6 +579,8 @@ struct str_map
void (*free) (void *); ///< Callback to destruct the payload
/// Callback to compare keys for equivalence
// FIXME: they may still end up on a different index, and actually should;
// delete this callback and put strxfrm() in its place
int (*key_cmp) (const char *, const char *);
};
@@ -1088,6 +1090,7 @@ poller_set (struct poller *self, int fd, short int events,
struct poller_info *info = self->info[index];
info->fd = fd;
info->events = events;
info->dispatcher = dispatcher;
info->user_data = data;