<p>Alexander Traud has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/15121">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Compiler fixes for GCC when printf %s is NULL<br><br>ASTERISK-29146<br><br>Change-Id: Ib04bdad87d729f805f5fc620ef9952f58ea96d41<br>---<br>M channels/chan_iax2.c<br>M channels/chan_sip.c<br>M main/indications.c<br>M res/res_stir_shaken.c<br>4 files changed, 9 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/21/15121/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c</span><br><span>index db4bef3..5a3ed80 100644</span><br><span>--- a/channels/chan_iax2.c</span><br><span>+++ b/channels/chan_iax2.c</span><br><span>@@ -2800,7 +2800,7 @@</span><br><span>       int error = 0;</span><br><span> </span><br><span>   if (ast_strlen_zero(addr)) {</span><br><span style="color: hsl(0, 100%, 40%);">-            ast_log(LOG_WARNING, "invalid calltokenoptional %s\n", addr);</span><br><span style="color: hsl(120, 100%, 40%);">+               ast_log(LOG_WARNING, "invalid calltokenoptional (null)\n");</span><br><span>                return -1;</span><br><span>   }</span><br><span> </span><br><span>diff --git a/channels/chan_sip.c b/channels/chan_sip.c</span><br><span>index e506d35..c9c7cfe 100644</span><br><span>--- a/channels/chan_sip.c</span><br><span>+++ b/channels/chan_sip.c</span><br><span>@@ -28802,7 +28802,7 @@</span><br><span>             if (start && !found_supported) {</span><br><span>                     /* Format requested that we do not support */</span><br><span>                        transmit_response(p, "406 Not Acceptable", req);</span><br><span style="color: hsl(0, 100%, 40%);">-                      ast_debug(2, "Received SIP mailbox subscription for unknown format: %s\n", accept);</span><br><span style="color: hsl(120, 100%, 40%);">+                 ast_debug(2, "Received SIP mailbox subscription for unknown format\n");</span><br><span>                    pvt_set_needdestroy(p, "unknown format");</span><br><span>                  if (authpeer) {</span><br><span>                              sip_unref_peer(authpeer, "sip_unref_peer, from handle_request_subscribe (authpeer 3)");</span><br><span>@@ -30382,7 +30382,7 @@</span><br><span> </span><br><span>      p_hdrval = sip_get_header(rsp, "Min-SE");</span><br><span>  if (ast_strlen_zero(p_hdrval)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                ast_log(LOG_WARNING, "422 response without a Min-SE header %s\n", p_hdrval);</span><br><span style="color: hsl(120, 100%, 40%);">+                ast_log(LOG_WARNING, "422 response without a Min-SE header\n");</span><br><span>            return;</span><br><span>      }</span><br><span>    rtn = parse_minse(p_hdrval, &minse);</span><br><span>diff --git a/main/indications.c b/main/indications.c</span><br><span>index 88cd7b4..d55c247 100644</span><br><span>--- a/main/indications.c</span><br><span>+++ b/main/indications.c</span><br><span>@@ -702,7 +702,11 @@</span><br><span>         ast_tone_zone_lock(tz);</span><br><span> </span><br><span>  if (ast_register_indication(tz, a->argv[3], a->argv[4])) {</span><br><span style="color: hsl(0, 100%, 40%);">-                ast_log(LOG_WARNING, "Unable to register indication %s/%s\n", a->argv[2], a->argv[3]);</span><br><span style="color: hsl(120, 100%, 40%);">+                if (ast_strlen_zero(a->argv[3])) {</span><br><span style="color: hsl(120, 100%, 40%);">+                 ast_log(LOG_WARNING, "Unable to register indication %s\n", a->argv[2]);</span><br><span style="color: hsl(120, 100%, 40%);">+          } else {</span><br><span style="color: hsl(120, 100%, 40%);">+                      ast_log(LOG_WARNING, "Unable to register indication %s/%s\n", a->argv[2], a->argv[3]);</span><br><span style="color: hsl(120, 100%, 40%);">+                }</span><br><span>            if (created_country) {</span><br><span>                       ast_unregister_indication_country(a->argv[2]);</span><br><span>            }</span><br><span>diff --git a/res/res_stir_shaken.c b/res/res_stir_shaken.c</span><br><span>index 7a141f7..30326d36 100644</span><br><span>--- a/res/res_stir_shaken.c</span><br><span>+++ b/res/res_stir_shaken.c</span><br><span>@@ -1200,7 +1200,7 @@</span><br><span>   */</span><br><span>  if (ast_strlen_zero(second)) {</span><br><span>               ast_log(LOG_ERROR, "Retrieving a value using %s requires two paramaters (index, value) "</span><br><span style="color: hsl(0, 100%, 40%);">-                      "- only index was given (%s)\n", function, second);</span><br><span style="color: hsl(120, 100%, 40%);">+                 "- only index was given\n", function);</span><br><span>             return -1;</span><br><span>   }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/15121">change 15121</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/+/15121"/><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: Ib04bdad87d729f805f5fc620ef9952f58ea96d41 </div>
<div style="display:none"> Gerrit-Change-Number: 15121 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>