ctdb: Use TALLOC_FREE() in a few places

[samba.git] / ctdb / common / ctdb_io.c

diff --git a/ctdb/common/ctdb_io.c b/ctdb/common/ctdb_io.c
index 000f71e4c201a24329e12ad28c26d606443cc10c..bf8bc73b77dc81575be1346412ebb454adb72df4 100644 (file)
--- a/ctdb/common/ctdb_io.c
+++ b/ctdb/common/ctdb_io.c
@@ -290,8 +290,7 @@ static void queue_io_write(struct ctdb_queue *queue)
                                queue->out_queue_length--;
                                talloc_free(pkt);
                        }
-                       talloc_free(queue->fde);
-                       queue->fde = NULL;
+                       TALLOC_FREE(queue->fde);
                        queue->fd = -1;
                        tevent_schedule_immediate(queue->im, queue->ctdb->ev,
                                                  queue_dead, queue);
@@ -363,8 +362,7 @@ int ctdb_queue_send(struct ctdb_queue *queue, uint8_t *data, uint32_t length)
            !(queue->ctdb->flags & CTDB_FLAG_TORTURE)) {
                ssize_t n = write(queue->fd, data, length2);
                if (n == -1 && errno != EAGAIN && errno != EWOULDBLOCK) {
-                       talloc_free(queue->fde);
-                       queue->fde = NULL;
+                       TALLOC_FREE(queue->fde);
                        queue->fd = -1;
                        tevent_schedule_immediate(queue->im, queue->ctdb->ev,
                                                  queue_dead, queue);
@@ -430,8 +428,7 @@ int ctdb_queue_send(struct ctdb_queue *queue, uint8_t *data, uint32_t length)
 int ctdb_queue_set_fd(struct ctdb_queue *queue, int fd)
 {
        queue->fd = fd;
-       talloc_free(queue->fde);
-       queue->fde = NULL;
+       TALLOC_FREE(queue->fde);
 
        if (fd != -1) {
                queue->fde = tevent_add_fd(queue->ctdb->ev, queue, fd,