diff options
Diffstat (limited to 'funcs')
-rw-r--r-- | funcs/func_cut.c | 1 | ||||
-rw-r--r-- | funcs/func_logic.c | 1 | ||||
-rw-r--r-- | funcs/func_odbc.c | 4 | ||||
-rw-r--r-- | funcs/func_strings.c | 4 |
4 files changed, 3 insertions, 7 deletions
diff --git a/funcs/func_cut.c b/funcs/func_cut.c index 82a564b42..cf1981627 100644 --- a/funcs/func_cut.c +++ b/funcs/func_cut.c @@ -141,7 +141,6 @@ static int cut_internal(struct ast_channel *chan, char *data, char *buffer, size if (tmp) { snprintf(tmp, strlen(args.varname) + 4, "${%s}", args.varname); - memset(varvalue, 0, sizeof(varvalue)); } else { return ERROR_NOMEM; } diff --git a/funcs/func_logic.c b/funcs/func_logic.c index aff358c24..4093be800 100644 --- a/funcs/func_logic.c +++ b/funcs/func_logic.c @@ -157,7 +157,6 @@ static int acf_import(struct ast_channel *chan, const char *cmd, char *data, cha AST_APP_ARG(varname); ); AST_STANDARD_APP_ARGS(args, data); - memset(buf, 0, len); if (!ast_strlen_zero(args.varname)) { struct ast_channel *chan2 = ast_get_channel_by_name_locked(args.channel); diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c index 069eaf7cd..a2f895b2e 100644 --- a/funcs/func_odbc.c +++ b/funcs/func_odbc.c @@ -138,7 +138,7 @@ static int acf_odbc_write(struct ast_channel *chan, const char *cmd, char *s, co { struct odbc_obj *obj = NULL; struct acf_odbc_query *query; - char *t, buf[2048]="", varname[15]; + char *t, buf[2048], varname[15]; int i, dsn, bogus_chan = 0; AST_DECLARE_APP_ARGS(values, AST_APP_ARG(field)[100]; @@ -256,7 +256,7 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha { struct odbc_obj *obj = NULL; struct acf_odbc_query *query; - char sql[2048] = "", varname[15], colnames[2048] = "", rowcount[12] = "-1"; + char sql[2048], varname[15], colnames[2048] = "", rowcount[12] = "-1"; int res, x, y, buflen = 0, escapecommas, rowlimit = 1, dsn, bogus_chan = 0; AST_DECLARE_APP_ARGS(args, AST_APP_ARG(field)[100]; diff --git a/funcs/func_strings.c b/funcs/func_strings.c index f4869f4da..0ed4bc159 100644 --- a/funcs/func_strings.c +++ b/funcs/func_strings.c @@ -48,7 +48,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") static int function_fieldqty(struct ast_channel *chan, const char *cmd, char *parse, char *buf, size_t len) { - char *varsubst, varval[8192] = "", *varval2 = varval; + char *varsubst, varval[8192], *varval2 = varval; int fieldcount = 0; AST_DECLARE_APP_ARGS(args, AST_APP_ARG(varname); @@ -734,8 +734,6 @@ static struct ast_custom_function strptime_function = { static int function_eval(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len) { - memset(buf, 0, len); - if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "EVAL requires an argument: EVAL(<string>)\n"); return -1; |