diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-01-06 03:20:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:08:26 -0500 |
| commit | e159e42d8472f36f51e400e351fc43f2a7dc44f5 (patch) | |
| tree | 641b7a3f25e77a4b8b1c2724287cd243119c411a /source4/lib/talloc/talloc.c | |
| parent | ddc10d4d37984246a6547e34a32d629c689c40d1 (diff) | |
| download | samba-e159e42d8472f36f51e400e351fc43f2a7dc44f5.tar.gz samba-e159e42d8472f36f51e400e351fc43f2a7dc44f5.tar.bz2 samba-e159e42d8472f36f51e400e351fc43f2a7dc44f5.zip | |
r4550: talloc() is now typesafe. It is exactly equivalent to the old talloc_p() macro. Use
talloc_size() if you want the old behaviour.
I have kept talloc_p() as an alias for now. Once we change all calls
to be plain talloc() then we can remove it.
(This used to be commit 2011bbeb841fd6bfccf3d44a49f79203f7f55baa)
Diffstat (limited to 'source4/lib/talloc/talloc.c')
| -rw-r--r-- | source4/lib/talloc/talloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/talloc/talloc.c b/source4/lib/talloc/talloc.c index 9e8868191f..bcadf40cfb 100644 --- a/source4/lib/talloc/talloc.c +++ b/source4/lib/talloc/talloc.c @@ -857,7 +857,7 @@ char *talloc_strndup(const void *t, const char *p, size_t n) for (len=0; p[len] && len<n; len++) ; - ret = talloc(t, len + 1); + ret = _talloc(t, len + 1); if (!ret) { return NULL; } memcpy(ret, p, len); ret[len] = 0; @@ -883,7 +883,7 @@ char *talloc_vasprintf(const void *t, const char *fmt, va_list ap) len = vsnprintf(NULL, 0, fmt, ap2); - ret = talloc(t, len+1); + ret = _talloc(t, len+1); if (ret) { VA_COPY(ap2, ap); vsnprintf(ret, len+1, fmt, ap2); |