The branch, master has been updated
via c6b95c3 ctdb: remove queue destructor as it isn't needed anymore
via d76c7b2 Minor, really small, documentation fix.
from eb4161d selftest: offline backup restore target
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c6b95c3672505924e9d5754457d6125f44406f4c
Author: Swen Schillig <[email protected]>
Date: Mon Mar 12 11:00:55 2018 +0100
ctdb: remove queue destructor as it isn't needed anymore
After
commit e097b7f8ff1a9992de1d11474dac4969e30cd679
Author: David Disseldorp <[email protected]>
Date: Sun Jul 31 03:14:54 2011 +0200
io: Make queue_io_read() safe for reentry
the destructor has no purpose anymore, therfore, remove it.
Signed-off-by: Swen Schillig <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
Reviewed-by: David Disseldorp <[email protected]>
Autobuild-User(master): Martin Schwenke <[email protected]>
Autobuild-Date(master): Mon Aug 6 11:37:32 CEST 2018 on sn-devel-144
commit d76c7b204e30a38747679ccd2597dd3a2b8bd394
Author: Richard Sharpe <[email protected]>
Date: Thu Feb 1 19:31:46 2018 -0800
Minor, really small, documentation fix.
Signed-off-by: Richard Sharpe <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ctdb/common/ctdb_io.c | 13 -------------
lib/tevent/tevent.h | 2 +-
2 files changed, 1 insertion(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/common/ctdb_io.c b/ctdb/common/ctdb_io.c
index c694124..da444ac 100644
--- a/ctdb/common/ctdb_io.c
+++ b/ctdb/common/ctdb_io.c
@@ -65,7 +65,6 @@ struct ctdb_queue {
size_t alignment;
void *private_data;
ctdb_queue_cb_fn_t callback;
- bool *destroyed;
const char *name;
uint32_t buffer_size;
};
@@ -411,17 +410,6 @@ int ctdb_queue_set_fd(struct ctdb_queue *queue, int fd)
return 0;
}
-/* If someone sets up this pointer, they want to know if the queue is freed */
-static int queue_destructor(struct ctdb_queue *queue)
-{
- TALLOC_FREE(queue->buffer.data);
- queue->buffer.length = 0;
- queue->buffer.size = 0;
- if (queue->destroyed != NULL)
- *queue->destroyed = true;
- return 0;
-}
-
/*
setup a packet queue on a socket
*/
@@ -454,7 +442,6 @@ struct ctdb_queue *ctdb_queue_setup(struct ctdb_context
*ctdb,
return NULL;
}
}
- talloc_set_destructor(queue, queue_destructor);
queue->buffer_size = ctdb->tunable.queue_buffer_size;
/* In client code, ctdb->tunable is not initialized.
diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h
index aa6fe0d..664604a 100644
--- a/lib/tevent/tevent.h
+++ b/lib/tevent/tevent.h
@@ -1187,7 +1187,7 @@ void _tevent_req_oom(struct tevent_req *req,
#endif
/**
- * @brief Finish a request before the caller had the change to set the
callback.
+ * @brief Finish a request before the caller had a chance to set the callback.
*
* An implementation of an async request might find that it can either finish
* the request without waiting for an external event, or it can not even start
--
Samba Shared Repository
