aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2007-11-04 22:38:13 +0000
committerrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2007-11-04 22:38:13 +0000
commitd01bd3f7ace2fd034e63f6aa884a534450aa4ffd (patch)
tree26e451020d5f848e4df9e7056ef81d24ae8a823d /include
parentd6199734e23aac123cda4075ad33e575341d46fe (diff)
Rename ast_string_field_free_pool to ast_string_field_free_memory,
and ast_string_field_free_all to ast_string_field_reset_all to avoid misuse (due to too similar names and an error in documentation). Fix two related memory leaks in app_meetme. No need to merge to trunk, different fix already applied there. Not applicable to 1.2 git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@88471 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/stringfields.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asterisk/stringfields.h b/include/asterisk/stringfields.h
index c3d675943..8b32f9ee7 100644
--- a/include/asterisk/stringfields.h
+++ b/include/asterisk/stringfields.h
@@ -74,7 +74,7 @@
and their storage pool must be freed:
\code
- ast_string_field_free_all(sample);
+ ast_string_field_free_memory(sample);
free(sample);
\endcode
*/
@@ -361,7 +361,7 @@ void __ast_string_field_index_build_va(struct ast_string_field_mgr *mgr,
structure; it should only be called immediately before freeing
the structure itself.
*/
-#define ast_string_field_free_pools(x) do { \
+#define ast_string_field_free_memory(x) do { \
struct ast_string_field_pool *this, *prev; \
for (this = (x)->__field_mgr.pool; this; this = prev) { \
prev = this->prev; \
@@ -378,7 +378,7 @@ void __ast_string_field_index_build_va(struct ast_string_field_mgr *mgr,
attached to the structure will be available for use by
stringfields again.
*/
-#define ast_string_field_free_all(x) do { \
+#define ast_string_field_reset_all(x) do { \
int index; \
for (index = 0; index < ast_string_field_count(x); index++) \
ast_string_field_index_free(x, index); \