<p>Jasper Hafkenscheid has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/18409">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">core:  Resolve C++ keyword conflict in ast_variable_list_replace.<br><br>The new parameter for ast_variable_list_replace conflicts with the C++ keyword.<br><br>ASTERISK-30021 #close<br><br>Change-Id: I8f750b886beefe888d90f929b45992fa8cd663e5<br>---<br>M include/asterisk/config.h<br>M main/config.c<br>2 files changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/09/18409/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/asterisk/config.h b/include/asterisk/config.h</span><br><span>index afac229..114839e 100644</span><br><span>--- a/include/asterisk/config.h</span><br><span>+++ b/include/asterisk/config.h</span><br><span>@@ -972,8 +972,8 @@</span><br><span>  *</span><br><span>  * \param head A pointer to the current variable list head.  Since the variable to be</span><br><span>  *             replaced, this pointer may be updated with the new head.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param old  A pointer to the existing variable to be replaced.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param new  A pointer to the new variable that will replace the old one.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param old A pointer to the existing variable to be replaced.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param replacement  A pointer to the new variable that will replace the old one.</span><br><span>  *</span><br><span>  * \retval 0 if a variable was replaced in the list</span><br><span>  * \retval -1 if no replacement occured</span><br><span>@@ -982,7 +982,7 @@</span><br><span>  * \note If a variable is replaced, its memory is freed.</span><br><span>  */</span><br><span> int ast_variable_list_replace_variable(struct ast_variable **head, struct ast_variable *old,</span><br><span style="color: hsl(0, 100%, 40%);">-        struct ast_variable *new);</span><br><span style="color: hsl(120, 100%, 40%);">+    struct ast_variable *replacement);</span><br><span> </span><br><span> /*!</span><br><span>  * \brief Join an ast_variable list with specified separators and quoted values</span><br><span>diff --git a/main/config.c b/main/config.c</span><br><span>index 122e7aa..82cf6bb 100644</span><br><span>--- a/main/config.c</span><br><span>+++ b/main/config.c</span><br><span>@@ -680,14 +680,14 @@</span><br><span> }</span><br><span> </span><br><span> int ast_variable_list_replace_variable(struct ast_variable **head, struct ast_variable *old,</span><br><span style="color: hsl(0, 100%, 40%);">-      struct ast_variable *new)</span><br><span style="color: hsl(120, 100%, 40%);">+     struct ast_variable *replacement)</span><br><span> {</span><br><span>       struct ast_variable *v, **prev = head;</span><br><span> </span><br><span>   for (v = *head; v; prev = &v->next, v = v->next) {</span><br><span>                 if (v == old) {</span><br><span style="color: hsl(0, 100%, 40%);">-                 new->next = v->next;</span><br><span style="color: hsl(0, 100%, 40%);">-                      *prev = new;</span><br><span style="color: hsl(120, 100%, 40%);">+                  replacement->next = v->next;</span><br><span style="color: hsl(120, 100%, 40%);">+                    *prev = replacement;</span><br><span>                         ast_free(v);</span><br><span>                         return 0;</span><br><span>            }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/18409">change 18409</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/18409"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 18 </div>
<div style="display:none"> Gerrit-Change-Id: I8f750b886beefe888d90f929b45992fa8cd663e5 </div>
<div style="display:none"> Gerrit-Change-Number: 18409 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Jasper Hafkenscheid <jasper.hafkenscheid@wearespindle.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>