Commit fcec0e23 authored by Niels Möller's avatar Niels Möller

Use NEW() macro. Bugfixes.

Rev: src/io.c:1.15
parent c3ff3457
...@@ -343,7 +343,7 @@ static int io_iter(struct io_backend *b) ...@@ -343,7 +343,7 @@ static int io_iter(struct io_backend *b)
}{ }{
struct callout *p; struct callout *p;
struct callout *next; struct callout *next;
for (p = io->callouts; (p = next); ) for (p = b->callouts; (p = next); )
{ {
next = p->next; next = p->next;
lsh_free(p); lsh_free(p);
...@@ -536,7 +536,7 @@ struct connect_fd *io_connect(struct io_backend *b, ...@@ -536,7 +536,7 @@ struct connect_fd *io_connect(struct io_backend *b,
return NULL; return NULL;
} }
fd = xalloc(sizeof(struct connect_fd)); NEW(fd);
fd->fd = s; fd->fd = s;
fd->callback = f; fd->callback = f;
...@@ -577,7 +577,7 @@ struct listen_fd *io_listen(struct io_backend *b, ...@@ -577,7 +577,7 @@ struct listen_fd *io_listen(struct io_backend *b,
return NULL; return NULL;
} }
fd = xalloc(sizeof(struct connect_fd)); NEW(fd);
fd->fd = s; fd->fd = s;
fd->callback = callback; fd->callback = callback;
...@@ -595,9 +595,10 @@ struct abstract_write *io_read_write(struct io_backend *b, ...@@ -595,9 +595,10 @@ struct abstract_write *io_read_write(struct io_backend *b,
UINT32 block_size, UINT32 block_size,
struct close_callback *close_callback) struct close_callback *close_callback)
{ {
struct io_fd *f= xalloc(sizeof(struct io_fd)); struct io_fd *f;
struct write_buffer *buffer = write_buffer_alloc(block_size); struct write_buffer *buffer = write_buffer_alloc(block_size);
NEW(f);
f->fd = fd; f->fd = fd;
f->close_reason = -1; /* Invalid reason */ f->close_reason = -1; /* Invalid reason */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment