From e2e049e473c348449a7d00cd0ed55267c5c4484f Mon Sep 17 00:00:00 2001
From: Naveen Albert <asterisk@phreaknet.org>
Date: Thu, 28 Jul 2022 21:12:09 +0000
Subject: [PATCH] general: Very minor coding guideline fixes.
Fixes a few coding guideline violations:
* Use of C99 comments
* Opening brace on same line as function prototype
ASTERISK-30163 #close
Change-Id: I07771c4c89facd41ce8d323859f022ddbddf6ca7
---
apps/app_mp3.c | 4 ++--
include/asterisk/strings.h | 1 -
main/channel_internal_api.c | 3 ++-
main/strings.c | 1 -
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/apps/app_mp3.c b/apps/app_mp3.c
index 9bc23c0477..ef342b30cc 100644
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -101,7 +101,7 @@ static int mp3play(const char *filename, unsigned int sampling_rate, int fd)
/* Execute mpg123, but buffer if it's a net connection */
if (!strncasecmp(filename, "http://", 7) && strstr(filename, ".m3u")) {
char buffer_size_str[8];
- snprintf(buffer_size_str, 8, "%u", (int) 0.5*2*sampling_rate/1000); // 0.5 seconds for a live stream
+ snprintf(buffer_size_str, 8, "%u", (int) 0.5*2*sampling_rate/1000); /* 0.5 seconds for a live stream */
/* Most commonly installed in /usr/local/bin */
execl(LOCAL_MPG_123, "mpg123", "-e", "s16", "-q", "-s", "-b", buffer_size_str, "-f", "8192", "--mono", "-r", sampling_rate_str, "-@", filename, (char *)NULL);
/* But many places has it in /usr/bin */
@@ -111,7 +111,7 @@ static int mp3play(const char *filename, unsigned int sampling_rate, int fd)
}
else if (!strncasecmp(filename, "http://", 7)) {
char buffer_size_str[8];
- snprintf(buffer_size_str, 8, "%u", 6*2*sampling_rate/1000); // 6 seconds for a remote MP3 file
+ snprintf(buffer_size_str, 8, "%u", 6*2*sampling_rate/1000); /* 6 seconds for a remote MP3 file */
/* Most commonly installed in /usr/local/bin */
execl(LOCAL_MPG_123, "mpg123", "-e", "s16", "-q", "-s", "-b", buffer_size_str, "-f", "8192", "--mono", "-r", sampling_rate_str, filename, (char *)NULL);
/* But many places has it in /usr/bin */
diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h
index d2c3c82ac8..d0a4cbb02a 100644
--- a/include/asterisk/strings.h
+++ b/include/asterisk/strings.h
@@ -1370,7 +1370,6 @@ static force_inline char *ast_str_to_upper(char *str)
* \return AO2 container for strings
* \retval NULL if allocation failed
*/
-//struct ao2_container *ast_str_container_alloc_options(enum ao2_container_opts opts, int buckets);
struct ao2_container *ast_str_container_alloc_options(enum ao2_alloc_opts opts, int buckets);
/*!
diff --git a/main/channel_internal_api.c b/main/channel_internal_api.c
index 123f61aebd..bc0fb4c641 100644
--- a/main/channel_internal_api.c
+++ b/main/channel_internal_api.c
@@ -1283,7 +1283,8 @@ struct ast_flags *ast_channel_flags(struct ast_channel *chan)
return &chan->flags;
}
-static int collect_names_cb(void *obj, void *arg, int flags) {
+static int collect_names_cb(void *obj, void *arg, int flags)
+{
struct ast_control_pvt_cause_code *cause_code = obj;
struct ast_str **str = arg;
diff --git a/main/strings.c b/main/strings.c
index 20769fae11..d40eed6a6c 100644
--- a/main/strings.c
+++ b/main/strings.c
@@ -197,7 +197,6 @@ static int str_cmp(void *lhs, void *rhs, int flags)
return cmp ? 0 : CMP_MATCH;
}
-//struct ao2_container *ast_str_container_alloc_options(enum ao2_container_opts opts, int buckets)
struct ao2_container *ast_str_container_alloc_options(enum ao2_alloc_opts opts, int buckets)
{
return ao2_container_alloc_hash(opts, 0, buckets, str_hash, str_sort, str_cmp);
--
GitLab