<p>Josh Soref has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/17086">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">spelling: parameter<br><br>Change-Id: I410d951a7b6aa82efdca03a03879f5847fbc074e<br>---<br>M CHANGES<br>M UPGRADE.txt<br>M addons/res_config_mysql.c<br>M channels/chan_sip.c<br>M include/asterisk/acl.h<br>M include/asterisk/presencestate.h<br>M main/enum.c<br>M main/manager.c<br>M main/xmldoc.c<br>M res/res_agi.c<br>M res/res_config_pgsql.c<br>M res/res_stir_shaken.c<br>12 files changed, 25 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/86/17086/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/CHANGES b/CHANGES</span><br><span>index d5dc76c..f906983 100644</span><br><span>--- a/CHANGES</span><br><span>+++ b/CHANGES</span><br><span>@@ -2616,7 +2616,7 @@</span><br><span> of whether the application 'controls' the resource. This is useful for</span><br><span> scenarios where an ARI application merely wants to observe the system,</span><br><span> as opposed to control it. There are two ways to accomplish this:</span><br><span style="color: hsl(0, 100%, 40%);">- (1) Via the WebSocket connection URI. A new query paramter, 'subscribeAll',</span><br><span style="color: hsl(120, 100%, 40%);">+ (1) Via the WebSocket connection URI. A new query parameter, 'subscribeAll',</span><br><span> has been added that, when present and True, will subscribe all</span><br><span> specified applications to all ARI event sources in Asterisk.</span><br><span> (2) Via the applications resource. An ARI client can, at any time, subscribe</span><br><span>diff --git a/UPGRADE.txt b/UPGRADE.txt</span><br><span>index f128214..d39616b 100644</span><br><span>--- a/UPGRADE.txt</span><br><span>+++ b/UPGRADE.txt</span><br><span>@@ -1476,7 +1476,7 @@</span><br><span> performance should be vastly improved. The HANGUPCAUSE function should now</span><br><span> be used instead of SIP_CAUSE. Because of this, the storesipcause option in</span><br><span> sip.conf is also deprecated.</span><br><span style="color: hsl(0, 100%, 40%);">- - The sip paramater for Originating Line Information (oli, isup-oli, and</span><br><span style="color: hsl(120, 100%, 40%);">+ - The sip parameter for Originating Line Information (oli, isup-oli, and</span><br><span> ss7-oli) is now parsed out of the From header and copied into the channel's</span><br><span> ANI2 information field. This is readable from the CALLERID(ani2) dialplan</span><br><span> function.</span><br><span>diff --git a/addons/res_config_mysql.c b/addons/res_config_mysql.c</span><br><span>index 359158b..5b0e0f4 100644</span><br><span>--- a/addons/res_config_mysql.c</span><br><span>+++ b/addons/res_config_mysql.c</span><br><span>@@ -334,7 +334,7 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Get the first parameter and first value in our list of passed paramater/value pairs */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Get the first parameter and first value in our list of passed parameter/value pairs */</span><br><span> if (!field) {</span><br><span> ast_log(LOG_WARNING, "MySQL RealTime: Realtime retrieval requires at least 1 parameter and 1 value to search on.\n");</span><br><span> release_database(dbh);</span><br><span>@@ -454,7 +454,7 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Get the first parameter and first value in our list of passed paramater/value pairs */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Get the first parameter and first value in our list of passed parameter/value pairs */</span><br><span> if (!field) {</span><br><span> ast_log(LOG_WARNING, "MySQL RealTime: Realtime retrieval requires at least 1 parameter and 1 value to search on.\n");</span><br><span> ast_config_destroy(cfg);</span><br><span>@@ -584,7 +584,7 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Get the first parameter and first value in our list of passed paramater/value pairs */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Get the first parameter and first value in our list of passed parameter/value pairs */</span><br><span> if (!field) {</span><br><span> ast_log(LOG_WARNING, "MySQL RealTime: Realtime update requires at least 1 parameter and 1 value to update.\n");</span><br><span> release_table(table);</span><br><span>@@ -767,7 +767,7 @@</span><br><span> release_database(dbh);</span><br><span> return -1;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- /* Get the first parameter and first value in our list of passed paramater/value pairs */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Get the first parameter and first value in our list of passed parameter/value pairs */</span><br><span> if (!field) {</span><br><span> ast_log(LOG_WARNING, "MySQL RealTime: Realtime storage requires at least 1 parameter and 1 value to search on.\n");</span><br><span> release_database(dbh);</span><br><span>@@ -826,7 +826,7 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Get the first parameter and first value in our list of passed paramater/value pairs */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Get the first parameter and first value in our list of passed parameter/value pairs */</span><br><span> /* newparam = va_arg(ap, const char *);</span><br><span> newval = va_arg(ap, const char *);*/</span><br><span> if (ast_strlen_zero(keyfield) || ast_strlen_zero(lookup)) {</span><br><span>diff --git a/channels/chan_sip.c b/channels/chan_sip.c</span><br><span>index 26a39c5..bc4fce1 100644</span><br><span>--- a/channels/chan_sip.c</span><br><span>+++ b/channels/chan_sip.c</span><br><span>@@ -17258,7 +17258,7 @@</span><br><span> }</span><br><span> </span><br><span> /*! \brief Build route list from Path header</span><br><span style="color: hsl(0, 100%, 40%);">- * RFC 3327 requires that the Path header contains SIP URIs with lr paramter.</span><br><span style="color: hsl(120, 100%, 40%);">+ * RFC 3327 requires that the Path header contains SIP URIs with lr parameter.</span><br><span> * Thus, we do not care about strict routing SIP routers</span><br><span> */</span><br><span> static int build_path(struct sip_pvt *p, struct sip_peer *peer, struct sip_request *req, const char *pathbuf)</span><br><span>diff --git a/include/asterisk/acl.h b/include/asterisk/acl.h</span><br><span>index def98c8..6f39cc2 100644</span><br><span>--- a/include/asterisk/acl.h</span><br><span>+++ b/include/asterisk/acl.h</span><br><span>@@ -342,7 +342,7 @@</span><br><span> * \details</span><br><span> * A deep copy of an ast_acl list is made (which in turn means a deep copy of</span><br><span> * each of the ast_ha structs contained within). The returned value is allocated</span><br><span style="color: hsl(0, 100%, 40%);">- * on the heap and must be freed independently of the input paramater when</span><br><span style="color: hsl(120, 100%, 40%);">+ * on the heap and must be freed independently of the input parameter when</span><br><span> * finished.</span><br><span> *</span><br><span> * \param original The ast_acl_list to copy</span><br><span>diff --git a/include/asterisk/presencestate.h b/include/asterisk/presencestate.h</span><br><span>index 87deda7..bad98c4 100644</span><br><span>--- a/include/asterisk/presencestate.h</span><br><span>+++ b/include/asterisk/presencestate.h</span><br><span>@@ -63,8 +63,8 @@</span><br><span> * \brief Asks a presence state provider for the current presence state.</span><br><span> *</span><br><span> * \param presence_provider The presence provider to retrieve the state from.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param subtype The output paramenter to store the subtype string in. Must be freed if returned</span><br><span style="color: hsl(0, 100%, 40%);">- * \param message The output paramenter to store the message string in. Must be freed if returned</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param subtype The output parameter to store the subtype string in. Must be freed if returned</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param message The output parameter to store the message string in. Must be freed if returned</span><br><span> *</span><br><span> * \retval presence state value on success,</span><br><span> * \retval -1 on failure.</span><br><span>@@ -79,8 +79,8 @@</span><br><span> * and should be bypassed.</span><br><span> *</span><br><span> * \param presence_provider The presence provider to retrieve the state from.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param subtype The output paramenter to store the subtype string in. Must be freed if returned</span><br><span style="color: hsl(0, 100%, 40%);">- * \param message The output paramenter to store the message string in. Must be freed if returned</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param subtype The output parameter to store the subtype string in. Must be freed if returned</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param message The output parameter to store the message string in. Must be freed if returned</span><br><span> *</span><br><span> * \retval presence state value on success,</span><br><span> * \retval -1 on failure.</span><br><span>diff --git a/main/enum.c b/main/enum.c</span><br><span>index 4c0f253..4d17c56 100644</span><br><span>--- a/main/enum.c</span><br><span>+++ b/main/enum.c</span><br><span>@@ -675,7 +675,7 @@</span><br><span> </span><br><span> /*</span><br><span> We don't need that any more, that "n" preceding the number has been replaced by a flag</span><br><span style="color: hsl(0, 100%, 40%);">- in the options paramter.</span><br><span style="color: hsl(120, 100%, 40%);">+ in the options parameter.</span><br><span> ast_copy_string(naptrinput, number, sizeof(naptrinput));</span><br><span> */</span><br><span> /*</span><br><span>diff --git a/main/manager.c b/main/manager.c</span><br><span>index 3c60af6..90a4f8b 100644</span><br><span>--- a/main/manager.c</span><br><span>+++ b/main/manager.c</span><br><span>@@ -1146,7 +1146,7 @@</span><br><span> this value along with the optional UnitType value are entries in a list. To accommodate this</span><br><span> these values take an index value starting at 0 which can be used to generate this list of</span><br><span> unit entries. For Example, If two unit entires were required this could be achieved by setting the</span><br><span style="color: hsl(0, 100%, 40%);">- paramter UnitAmount(0)=1234 and UnitAmount(1)=5678. Note that UnitAmount at index 0 is</span><br><span style="color: hsl(120, 100%, 40%);">+ parameter UnitAmount(0)=1234 and UnitAmount(1)=5678. Note that UnitAmount at index 0 is</span><br><span> required when ChargeType=Unit, all other entries in the list are optional.</span><br><span> </para></span><br><span> </parameter></span><br><span>diff --git a/main/xmldoc.c b/main/xmldoc.c</span><br><span>index 0a2c33a..57bd40d 100644</span><br><span>--- a/main/xmldoc.c</span><br><span>+++ b/main/xmldoc.c</span><br><span>@@ -924,7 +924,7 @@</span><br><span> *</span><br><span> * \param fixnode The <syntax> node pointer.</span><br><span> * \param name The name of the 'command'.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param printname Print the name of the command before the paramters?</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param printname Print the name of the command before the parameters?</span><br><span> *</span><br><span> * \retval On error, return just 'name'.</span><br><span> * \retval On success return the generated syntax.</span><br><span>diff --git a/res/res_agi.c b/res/res_agi.c</span><br><span>index 631c9b8..e7b246c 100644</span><br><span>--- a/res/res_agi.c</span><br><span>+++ b/res/res_agi.c</span><br><span>@@ -2290,7 +2290,7 @@</span><br><span> ast_close_fds_above_n(STDERR_FILENO + 1);</span><br><span> </span><br><span> /* Execute script */</span><br><span style="color: hsl(0, 100%, 40%);">- /* XXX argv should be deprecated in favor of passing agi_argX paramaters */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* XXX argv should be deprecated in favor of passing agi_argX parameters */</span><br><span> execv(script, argv);</span><br><span> /* Can't use ast_log since FD's are closed */</span><br><span> ast_child_verbose(1, "Failed to execute '%s': %s", script, strerror(errno));</span><br><span>@@ -2353,7 +2353,7 @@</span><br><span> ast_agi_send(fd, chan, "agi_threadid: %ld\n", (long)pthread_self());</span><br><span> </span><br><span> /* Send any parameters to the fastagi server that have been passed via the agi application */</span><br><span style="color: hsl(0, 100%, 40%);">- /* Agi application paramaters take the form of: AGI(/path/to/example/script|${EXTEN}) */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Agi application parameters take the form of: AGI(/path/to/example/script|${EXTEN}) */</span><br><span> for(count = 1; count < argc; count++)</span><br><span> ast_agi_send(fd, chan, "agi_arg_%d: %s\n", count, argv[count]);</span><br><span> </span><br><span>diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c</span><br><span>index 6f49f8e..14519c4 100644</span><br><span>--- a/res/res_config_pgsql.c</span><br><span>+++ b/res/res_config_pgsql.c</span><br><span>@@ -421,7 +421,7 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Get the first parameter and first value in our list of passed paramater/value pairs */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Get the first parameter and first value in our list of passed parameter/value pairs */</span><br><span> if (!field) {</span><br><span> ast_log(LOG_WARNING,</span><br><span> "PostgreSQL RealTime: Realtime retrieval requires at least 1 parameter and 1 value to search on.\n");</span><br><span>@@ -561,7 +561,7 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Get the first parameter and first value in our list of passed paramater/value pairs */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Get the first parameter and first value in our list of passed parameter/value pairs */</span><br><span> if (!field) {</span><br><span> ast_log(LOG_WARNING,</span><br><span> "PostgreSQL RealTime: Realtime retrieval requires at least 1 parameter and 1 value to search on.\n");</span><br><span>@@ -736,7 +736,7 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Get the first parameter and first value in our list of passed paramater/value pairs */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Get the first parameter and first value in our list of passed parameter/value pairs */</span><br><span> if (!field) {</span><br><span> ast_log(LOG_WARNING,</span><br><span> "PostgreSQL RealTime: Realtime retrieval requires at least 1 parameter and 1 value to search on.\n");</span><br><span>@@ -997,7 +997,7 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Get the first parameter and first value in our list of passed paramater/value pairs */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Get the first parameter and first value in our list of passed parameter/value pairs */</span><br><span> if (!field) {</span><br><span> ast_log(LOG_WARNING,</span><br><span> "PostgreSQL RealTime: Realtime storage requires at least 1 parameter and 1 value to store.\n");</span><br><span>@@ -1079,7 +1079,7 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Get the first parameter and first value in our list of passed paramater/value pairs */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Get the first parameter and first value in our list of passed parameter/value pairs */</span><br><span> if (ast_strlen_zero(keyfield) || ast_strlen_zero(lookup)) {</span><br><span> ast_log(LOG_WARNING,</span><br><span> "PostgreSQL RealTime: Realtime destroy requires at least 1 parameter and 1 value to search on.\n");</span><br><span>diff --git a/res/res_stir_shaken.c b/res/res_stir_shaken.c</span><br><span>index eb5ba55..3db1c92 100644</span><br><span>--- a/res/res_stir_shaken.c</span><br><span>+++ b/res/res_stir_shaken.c</span><br><span>@@ -1243,7 +1243,7 @@</span><br><span> size_t count = 0;</span><br><span> </span><br><span> if (!ast_strlen_zero(second)) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_log(LOG_ERROR, "%s only takes 1 paramater for 'count'\n", function);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(LOG_ERROR, "%s only takes 1 parameter for 'count'\n", function);</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span>@@ -1264,7 +1264,7 @@</span><br><span> * we are searching for will be the second parameter. The index is the first.</span><br><span> */</span><br><span> if (ast_strlen_zero(second)) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_log(LOG_ERROR, "Retrieving a value using %s requires two paramaters (index, value) "</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(LOG_ERROR, "Retrieving a value using %s requires two parameters (index, value) "</span><br><span> "- only index was given\n", function);</span><br><span> return -1;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/17086">change 17086</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/+/17086"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I410d951a7b6aa82efdca03a03879f5847fbc074e </div>
<div style="display:none"> Gerrit-Change-Number: 17086 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Josh Soref <jsoref@gmail.com> </div>
<div style="display:none"> Gerrit-CC: Friendly Automation </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>