aboutsummaryrefslogtreecommitdiffstats
path: root/main/utils.c
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-23 21:05:22 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-23 21:05:22 +0000
commitee55d65fa407d6fa4ccda5cc85c5b0ffdcadbc95 (patch)
tree688fd1caf2ddbbb10dc82ff6100c165cc426979c /main/utils.c
parent8ec1a1b17cbd659efff717d65267cd0c055d19f9 (diff)
revert an optimization that broke ABI... thanks russell!
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@133237 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/utils.c')
-rw-r--r--main/utils.c26
1 files changed, 0 insertions, 26 deletions
diff --git a/main/utils.c b/main/utils.c
index 8906eff11..9749949e1 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -1223,7 +1223,6 @@ static int add_string_pool(struct ast_string_field_mgr *mgr, size_t size)
mgr->size = size;
mgr->space = size;
mgr->used = 0;
- mgr->last_alloc = NULL;
return 0;
}
@@ -1260,33 +1259,9 @@ ast_string_field __ast_string_field_alloc_space(struct ast_string_field_mgr *mgr
result = mgr->pool->base + mgr->used;
mgr->used += needed;
mgr->space -= needed;
- mgr->last_alloc = result;
return result;
}
-int __ast_string_field_index_grow(struct ast_string_field_mgr *mgr, size_t needed,
- ast_string_field *fields, int index)
-{
- int grow = needed - (strlen(fields[index]) + 1);
-
- if (grow <= 0) {
- return 0;
- }
-
- if (fields[index] != mgr->last_alloc) {
- return 1;
- }
-
- if (mgr->space < grow) {
- return 1;
- }
-
- mgr->space -= grow;
- mgr->used += grow;
-
- return 0;
-}
-
void __ast_string_field_index_build_va(struct ast_string_field_mgr *mgr,
ast_string_field *fields, int num_fields,
int index, const char *format, va_list ap1, va_list ap2)
@@ -1310,7 +1285,6 @@ void __ast_string_field_index_build_va(struct ast_string_field_mgr *mgr,
}
fields[index] = mgr->pool->base + mgr->used;
- mgr->last_alloc = fields[index];
mgr->used += needed;
mgr->space -= needed;
}