From b1e0527bbd83c5ac133ed76f7c9d5b914ab4661b Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Tue, 19 Apr 2022 11:36:12 -0400 Subject: [PATCH] config.h: Don't use C++ keywords as argument names. ASTERISK-30021 #close Change-Id: I70eb59b782a4946b979942e21422746b7563029c --- include/asterisk/config.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/include/asterisk/config.h b/include/asterisk/config.h index afac2290e2..3aef5f14b9 100644 --- a/include/asterisk/config.h +++ b/include/asterisk/config.h @@ -970,10 +970,10 @@ int ast_variable_list_replace(struct ast_variable **head, struct ast_variable *r /*! * \brief Replace a variable in the given list with a new variable * - * \param head A pointer to the current variable list head. Since the variable to be - * replaced, this pointer may be updated with the new head. - * \param old A pointer to the existing variable to be replaced. - * \param new A pointer to the new variable that will replace the old one. + * \param head A pointer to the current variable list head. Since the variable to be + * replaced, this pointer may be updated with the new head. + * \param oldvar A pointer to the existing variable to be replaced. + * \param newvar A pointer to the new variable that will replace the old one. * * \retval 0 if a variable was replaced in the list * \retval -1 if no replacement occured @@ -981,8 +981,9 @@ int ast_variable_list_replace(struct ast_variable **head, struct ast_variable *r * \note The search for the old variable is done simply on the pointer. * \note If a variable is replaced, its memory is freed. */ -int ast_variable_list_replace_variable(struct ast_variable **head, struct ast_variable *old, - struct ast_variable *new); +int ast_variable_list_replace_variable(struct ast_variable **head, + struct ast_variable *oldvar, + struct ast_variable *newvar); /*! * \brief Join an ast_variable list with specified separators and quoted values