diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-28 19:41:18 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-28 19:41:18 +0000 |
| commit | 5d6dc7ab735b8701ffa72115e0f19619f24d3908 (patch) | |
| tree | e0ecc6c53be20cead23b7d702f6f9a18f83cb22e | |
| parent | 19dd1526bcf6b6042f2d5a2280e98da9e3ff6e4a (diff) | |
Remove the ill-advised ast_restrdupa API call and related structures
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@72492 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | include/asterisk/strings.h | 18 | ||||
| -rw-r--r-- | res/res_config_odbc.c | 5 | ||||
| -rw-r--r-- | res/res_config_pgsql.c | 3 |
3 files changed, 1 insertions, 25 deletions
diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h index ab610982c..d1799de51 100644 --- a/include/asterisk/strings.h +++ b/include/asterisk/strings.h @@ -244,24 +244,6 @@ void ast_join(char *s, size_t len, char * const w[]); */ int ast_get_time_t(const char *src, time_t *dst, time_t _default, int *consumed); -/* The realloca lets us ast_restrdupa(), but you can't mix any other ast_strdup calls! */ - -struct ast_realloca { - char *ptr; - int alloclen; -}; - -#define ast_restrdupa(ra, s) \ - ({ \ - if ((ra)->ptr && strlen(s) + 1 < (ra)->alloclen) { \ - strcpy((ra)->ptr, s); \ - } else { \ - (ra)->ptr = alloca(strlen(s) + 1 - (ra)->alloclen); \ - if ((ra)->ptr) (ra)->alloclen = strlen(s) + 1; \ - } \ - (ra)->ptr; \ - }) - /*! * Support for dynamic strings. * diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index ae712042a..7715166b4 100644 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -220,7 +220,6 @@ static struct ast_config *realtime_multi_odbc(const char *database, const char * struct ast_variable *var=NULL; struct ast_config *cfg=NULL; struct ast_category *cat=NULL; - struct ast_realloca ra; SQLULEN colsize; SQLSMALLINT colcount=0; SQLSMALLINT datatype; @@ -230,11 +229,9 @@ static struct ast_config *realtime_multi_odbc(const char *database, const char * va_list aq; va_copy(aq, ap); - - + if (!table) return NULL; - memset(&ra, 0, sizeof(ra)); obj = ast_odbc_request_obj(database, 0); if (!obj) diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c index 821f32cc0..e8993dd86 100644 --- a/res/res_config_pgsql.c +++ b/res/res_config_pgsql.c @@ -208,7 +208,6 @@ static struct ast_config *realtime_multi_pgsql(const char *database, const char char *chunk; char *op; const char *newparam, *newval; - struct ast_realloca ra; struct ast_variable *var = NULL; struct ast_config *cfg = NULL; struct ast_category *cat = NULL; @@ -218,8 +217,6 @@ static struct ast_config *realtime_multi_pgsql(const char *database, const char return NULL; } - memset(&ra, 0, sizeof(ra)); - if (!(cfg = ast_config_new())) return NULL; |