mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 03:20:57 +00:00
Compiler fixes for gcc 10
This patch fixes a few compile warnings/errors that now occur when using gcc 10+. Also, the Makefile.rules check to turn off partial inlining in gcc versions greater or equal to 8.2.1 had a bug where it only it only checked against versions with at least 3 numbers (ex: 8.2.1 vs 10). This patch now ensures any version above the specified version is correctly compared. Change-Id: I54718496eb0c3ce5bd6d427cd279a29e8d2825f9
This commit is contained in:
committed by
Friendly Automation
parent
559fa0e89c
commit
3d1bf3c537
@@ -1057,14 +1057,16 @@ static struct ast_variable *ast_variable_new(const char *name, const char *value
|
||||
{
|
||||
struct ast_variable *variable;
|
||||
int name_len = strlen(name) + 1;
|
||||
size_t value_len = strlen(value) + 1;
|
||||
size_t filename_len = strlen(filename) + 1;
|
||||
|
||||
if ((variable = ast_calloc(1, name_len + strlen(value) + 1 + strlen(filename) + 1 + sizeof(*variable)))) {
|
||||
if ((variable = ast_calloc(1, name_len + value_len + filename_len + sizeof(*variable)))) {
|
||||
variable->name = variable->stuff;
|
||||
variable->value = variable->stuff + name_len;
|
||||
variable->file = variable->value + strlen(value) + 1;
|
||||
variable->file = variable->value + value_len;
|
||||
strcpy(variable->name,name);
|
||||
strcpy(variable->value,value);
|
||||
strcpy(variable->file,filename);
|
||||
ast_copy_string(variable->value, value, value_len);
|
||||
ast_copy_string(variable->file, filename, filename_len);
|
||||
}
|
||||
|
||||
return variable;
|
||||
|
Reference in New Issue
Block a user