Merge "Astobj2: Allow reference debugging to be enabled/disabled by config."

1 files changed, 3 insertions, 11 deletions

diff --git a/main/format_cache.c b/main/format_cache.c
index 3e729769c..def795c9d 100644
--- a/main/format_cache.c
+++ b/main/format_cache.c
@@ -457,22 +457,14 @@ int ast_format_cache_set(struct ast_format *format)
 	return 0;
 }
 
-struct ast_format *__ast_format_cache_get(const char *name)
+struct ast_format *__ast_format_cache_get(const char *name,
+	const char *tag, const char *file, int line, const char *func)
 {
 	if (ast_strlen_zero(name)) {
 		return NULL;
 	}
 
-	return ao2_find(formats, name, OBJ_SEARCH_KEY);
-}
-
-struct ast_format *__ast_format_cache_get_debug(const char *name, const char *tag, const char *file, int line, const char *func)
-{
-	if (ast_strlen_zero(name)) {
-		return NULL;
-	}
-
-	return __ao2_find_debug(formats, name, OBJ_SEARCH_KEY, S_OR(tag, "ast_format_cache_get"), file, line, func);
+	return __ao2_find(formats, name, OBJ_SEARCH_KEY, tag, file, line, func);
 }
 
 struct ast_format *ast_format_cache_get_slin_by_rate(unsigned int rate)