From cc55aef7c116d03ba2817625b0ba9edb378525e3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 6 Jan 2005 02:32:43 +0000 Subject: r4547: - added talloc_new(ctx) macro that is a neater form of the common talloc(ctx, 0) call. - cleaned up some talloc usage in various files I'd like to get to the point that we have no calls to talloc(), at which point we will rename talloc_p() to talloc(), to encourage everyone to use the typesafe functions. (This used to be commit e6c81d7c9f8a6938947d3c1c8a971a0d6d50b67a) --- source4/ldap_server/ldap_parse.c | 4 ++-- source4/ldap_server/ldap_server.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/ldap_server') diff --git a/source4/ldap_server/ldap_parse.c b/source4/ldap_server/ldap_parse.c index 269f51704c..d645d24104 100644 --- a/source4/ldap_server/ldap_parse.c +++ b/source4/ldap_server/ldap_parse.c @@ -80,7 +80,7 @@ static void ldap_parse_attributetypedescription(struct ldap_schema *schema, DATA { char *desc; - desc = (char *)talloc(schema, data->lenght + 1); + desc = talloc_array_p(schema, char, data->lenght + 1); memcpy(desc, data->data, data->lenght); desc[data->lenght] = '\0'; @@ -90,7 +90,7 @@ static void ldap_parse_objectclassdescription(struct ldap_schema *schema, DATA_B { char *desc; - desc = (char *)talloc(schema, data->lenght + 1); + desc = talloc_array_p(schema, char, data->lenght + 1); memcpy(desc, data->data, data->lenght); desc[data->lenght] = '\0'; diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index 0bace4b690..a301c14084 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -206,7 +206,7 @@ static BOOL ldapsrv_read_buf(struct ldapsrv_connection *conn) return read_into_buf(sock, &conn->in_buffer); } - mem_ctx = talloc(conn, 0); + mem_ctx = talloc_new(conn); if (!mem_ctx) { DEBUG(0,("no memory\n")); return False; @@ -315,7 +315,7 @@ static BOOL ldapsrv_write_buf(struct ldapsrv_connection *conn) return write_from_buf(sock, &conn->out_buffer); } - mem_ctx = talloc(conn, 0); + mem_ctx = talloc_new(conn); if (!mem_ctx) { DEBUG(0,("no memory\n")); return False; -- cgit