diff options
| author | Stefan Metzmacher <metze@samba.org> | 2013-12-04 23:22:04 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2015-03-15 22:14:08 +0100 |
| commit | 61e684859b25673589f44e684ef3e077e5d37d4b (patch) | |
| tree | bf1d534d2c70dbbac40990abd7f00020e06cf000 | |
| parent | 0886602f5cbf4b6ad432c914df8577ae55e0949e (diff) | |
| download | samba-61e684859b25673589f44e684ef3e077e5d37d4b.tar.gz | |
talloc: inline talloc_get_name()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 014eecd0b2aead3a160af0d864feddd53c85b580)
| -rw-r--r-- | lib/talloc/talloc.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c index 56ad4f75d88..3b8cb81df4a 100644 --- a/lib/talloc/talloc.c +++ b/lib/talloc/talloc.c @@ -1355,7 +1355,7 @@ _PUBLIC_ void *talloc_named(const void *context, size_t size, const char *fmt, . /* return the name of a talloc ptr, or "UNNAMED" */ -_PUBLIC_ const char *talloc_get_name(const void *ptr) +static inline const char *__talloc_get_name(const void *ptr) { struct talloc_chunk *tc = talloc_chunk_from_ptr(ptr); if (unlikely(tc->name == TALLOC_MAGIC_REFERENCE)) { @@ -1367,6 +1367,10 @@ _PUBLIC_ const char *talloc_get_name(const void *ptr) return "UNNAMED"; } +_PUBLIC_ const char *talloc_get_name(const void *ptr) +{ + return __talloc_get_name(ptr); +} /* check if a pointer has the given name. If it does, return the pointer, @@ -1376,7 +1380,7 @@ _PUBLIC_ void *talloc_check_name(const void *ptr, const char *name) { const char *pname; if (unlikely(ptr == NULL)) return NULL; - pname = talloc_get_name(ptr); + pname = __talloc_get_name(ptr); if (likely(pname == name || strcmp(pname, name) == 0)) { return discard_const_p(void, ptr); } @@ -1410,7 +1414,7 @@ _PUBLIC_ void *_talloc_get_type_abort(const void *ptr, const char *name, const c return NULL; } - pname = talloc_get_name(ptr); + pname = __talloc_get_name(ptr); if (likely(pname == name || strcmp(pname, name) == 0)) { return discard_const_p(void, ptr); } @@ -2028,7 +2032,7 @@ _PUBLIC_ void talloc_report_depth_cb(const void *ptr, int depth, int max_depth, static void talloc_report_depth_FILE_helper(const void *ptr, int depth, int max_depth, int is_ref, void *_f) { - const char *name = talloc_get_name(ptr); + const char *name = __talloc_get_name(ptr); struct talloc_chunk *tc; FILE *f = (FILE *)_f; @@ -2628,9 +2632,9 @@ _PUBLIC_ void talloc_show_parents(const void *context, FILE *file) } tc = talloc_chunk_from_ptr(context); - fprintf(file, "talloc parents of '%s'\n", talloc_get_name(context)); + fprintf(file, "talloc parents of '%s'\n", __talloc_get_name(context)); while (tc) { - fprintf(file, "\t'%s'\n", talloc_get_name(TC_PTR_FROM_CHUNK(tc))); + fprintf(file, "\t'%s'\n", __talloc_get_name(TC_PTR_FROM_CHUNK(tc))); while (tc && tc->prev) tc = tc->prev; if (tc) { tc = tc->parent; |