<p>Joshua Colp <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/18942">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve; Approved for Submit
Sean Bright: Looks good to me, approved
Benjamin Keith Ford: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">general: Very minor coding guideline fixes.<br><br>Fixes a few coding guideline violations:<br>* Use of C99 comments<br>* Opening brace on same line as function prototype<br><br>ASTERISK-30163 #close<br><br>Change-Id: I07771c4c89facd41ce8d323859f022ddbddf6ca7<br>---<br>M apps/app_mp3.c<br>M include/asterisk/strings.h<br>M main/channel_internal_api.c<br>M main/strings.c<br>4 files changed, 4 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/app_mp3.c b/apps/app_mp3.c</span><br><span>index 9bc23c0..ef342b3 100644</span><br><span>--- a/apps/app_mp3.c</span><br><span>+++ b/apps/app_mp3.c</span><br><span>@@ -101,7 +101,7 @@</span><br><span> /* Execute mpg123, but buffer if it's a net connection */</span><br><span> if (!strncasecmp(filename, "http://", 7) && strstr(filename, ".m3u")) {</span><br><span> char buffer_size_str[8];</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(buffer_size_str, 8, "%u", (int) 0.5*2*sampling_rate/1000); // 0.5 seconds for a live stream</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(buffer_size_str, 8, "%u", (int) 0.5*2*sampling_rate/1000); /* 0.5 seconds for a live stream */</span><br><span> /* Most commonly installed in /usr/local/bin */</span><br><span> execl(LOCAL_MPG_123, "mpg123", "-e", "s16", "-q", "-s", "-b", buffer_size_str, "-f", "8192", "--mono", "-r", sampling_rate_str, "-@", filename, (char *)NULL);</span><br><span> /* But many places has it in /usr/bin */</span><br><span>@@ -111,7 +111,7 @@</span><br><span> }</span><br><span> else if (!strncasecmp(filename, "http://", 7)) {</span><br><span> char buffer_size_str[8];</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(buffer_size_str, 8, "%u", 6*2*sampling_rate/1000); // 6 seconds for a remote MP3 file</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(buffer_size_str, 8, "%u", 6*2*sampling_rate/1000); /* 6 seconds for a remote MP3 file */</span><br><span> /* Most commonly installed in /usr/local/bin */</span><br><span> execl(LOCAL_MPG_123, "mpg123", "-e", "s16", "-q", "-s", "-b", buffer_size_str, "-f", "8192", "--mono", "-r", sampling_rate_str, filename, (char *)NULL);</span><br><span> /* But many places has it in /usr/bin */</span><br><span>diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h</span><br><span>index d2c3c82..d0a4cbb 100644</span><br><span>--- a/include/asterisk/strings.h</span><br><span>+++ b/include/asterisk/strings.h</span><br><span>@@ -1370,7 +1370,6 @@</span><br><span> * \return AO2 container for strings</span><br><span> * \retval NULL if allocation failed</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-//struct ao2_container *ast_str_container_alloc_options(enum ao2_container_opts opts, int buckets);</span><br><span> struct ao2_container *ast_str_container_alloc_options(enum ao2_alloc_opts opts, int buckets);</span><br><span> </span><br><span> /*!</span><br><span>diff --git a/main/channel_internal_api.c b/main/channel_internal_api.c</span><br><span>index c52b972..a7b332a 100644</span><br><span>--- a/main/channel_internal_api.c</span><br><span>+++ b/main/channel_internal_api.c</span><br><span>@@ -1239,7 +1239,8 @@</span><br><span> return &chan->flags;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int collect_names_cb(void *obj, void *arg, int flags) {</span><br><span style="color: hsl(120, 100%, 40%);">+static int collect_names_cb(void *obj, void *arg, int flags)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> struct ast_control_pvt_cause_code *cause_code = obj;</span><br><span> struct ast_str **str = arg;</span><br><span> </span><br><span>diff --git a/main/strings.c b/main/strings.c</span><br><span>index 20769fa..d40eed6 100644</span><br><span>--- a/main/strings.c</span><br><span>+++ b/main/strings.c</span><br><span>@@ -197,7 +197,6 @@</span><br><span> return cmp ? 0 : CMP_MATCH;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-//struct ao2_container *ast_str_container_alloc_options(enum ao2_container_opts opts, int buckets)</span><br><span> struct ao2_container *ast_str_container_alloc_options(enum ao2_alloc_opts opts, int buckets)</span><br><span> {</span><br><span> return ao2_container_alloc_hash(opts, 0, buckets, str_hash, str_sort, str_cmp);</span><br><span></span><br></pre><div style="white-space:pre-wrap"></div><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/18942">change 18942</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/+/18942"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: I07771c4c89facd41ce8d323859f022ddbddf6ca7 </div>
<div style="display:none"> Gerrit-Change-Number: 18942 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: N A <mail@interlinked.x10host.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: Sean Bright <sean@seanbright.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>