diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-07 12:13:26 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-09 12:40:08 +0200 |
| commit | 8d4a8389bb2df77ff8923dda8368aa2915652c1a (patch) | |
| tree | aba02d7ca688a18a9ecfa2beccfe4e1b8d464c72 /source3/lib | |
| parent | 5e26e94092b56ee47e7ec7837f7cd0feb3fb0119 (diff) | |
| download | samba-8d4a8389bb2df77ff8923dda8368aa2915652c1a.tar.gz samba-8d4a8389bb2df77ff8923dda8368aa2915652c1a.tar.bz2 samba-8d4a8389bb2df77ff8923dda8368aa2915652c1a.zip | |
s3-talloc Change TALLOC_MEMDUP() to talloc_memdup()
Using the standard macro makes it easier to move code into common, as
TALLOC_MEMDUP isn't standard talloc.
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/ctdb_packet.c | 2 | ||||
| -rw-r--r-- | source3/lib/util.c | 2 | ||||
| -rw-r--r-- | source3/lib/util_sock.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/ctdb_packet.c b/source3/lib/ctdb_packet.c index 9faf519a60..17c70ff2d6 100644 --- a/source3/lib/ctdb_packet.c +++ b/source3/lib/ctdb_packet.c @@ -153,7 +153,7 @@ bool ctdb_packet_handler(struct ctdb_packet_context *ctx, ctx->in.data = NULL; ctx->in.length = 0; } else { - buf = (uint8_t *)TALLOC_MEMDUP(ctx, ctx->in.data, length); + buf = (uint8_t *)talloc_memdup(ctx, ctx->in.data, length); if (buf == NULL) { *status = NT_STATUS_NO_MEMORY; return true; diff --git a/source3/lib/util.c b/source3/lib/util.c index b4af9fbc0e..af5f63995b 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -1563,7 +1563,7 @@ bool parent_dirname(TALLOC_CTX *mem_ctx, const char *dir, char **parent, len = p-dir; - if (!(*parent = (char *)TALLOC_MEMDUP(mem_ctx, dir, len+1))) { + if (!(*parent = (char *)talloc_memdup(mem_ctx, dir, len+1))) { return False; } (*parent)[len] = '\0'; diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c index d44adaf915..fd91fd58dc 100644 --- a/source3/lib/util_sock.c +++ b/source3/lib/util_sock.c @@ -257,7 +257,7 @@ ssize_t write_data_iov(int fd, const struct iovec *orig_iov, int iovcnt) * discarding elements. */ - iov_copy = (struct iovec *)TALLOC_MEMDUP( + iov_copy = (struct iovec *)talloc_memdup( talloc_tos(), orig_iov, sizeof(struct iovec) * iovcnt); if (iov_copy == NULL) { |