sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Little variable optimizations 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4144 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer 2004-11-01 15:48:42 +00:00
parent 2f5cd4a95c
commit 6dce1a5a3f
2 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
chanvars.c
View File

@ -21,8 +21,14 @@ struct ast_var_t *ast_var_assign(const char *name, const char *value)
{
int i;
struct ast_var_t *var;
int len;
var = malloc(sizeof(struct ast_var_t));
len = sizeof(struct ast_var_t);
len += strlen(name) + 1;
len += strlen(value) + 1;
var = malloc(len);
if (var == NULL)
{
@ -30,41 +36,22 @@ struct ast_var_t *ast_var_assign(const char *name, const char *value)
return NULL;
}
i = strlen(value);
var->value = malloc(i + 1);
if (var->value == NULL)
{
ast_log(LOG_WARNING, "Out of memory\n");
free(var);
return NULL;
}
strncpy(var->value, value, i);
var->value[i] = '\0';
i = strlen(name);
var->name = malloc(i + 1);
if (var->name == NULL)
{
ast_log(LOG_WARNING, "Out of memory\n");
free(var->value);
free(var);
return NULL;
}
strncpy(var->name, name, i);
var->name[i] = '\0';
var->value = var->name + i + 1;
i = strlen(value);
strncpy(var->value, value, i);
var->value[i] = '\0';
return var;
}
void ast_var_delete(struct ast_var_t *var)
{
if (var == NULL) return;
if (var->name != NULL) free(var->name);
if (var->value != NULL) free(var->value);
free(var);
}

4
include/asterisk/chanvars.h
View File

@ -17,9 +17,9 @@
#include <asterisk/linkedlists.h>
struct ast_var_t {
char *name;
char *value;
AST_LIST_ENTRY(ast_var_t) entries;
char *value;
char name[0];
};
struct ast_var_t *ast_var_assign(const char *name, const char *value);