Skip to content

Commit

Permalink
general: Very minor coding guideline fixes.
Browse files Browse the repository at this point in the history
Fixes a few coding guideline violations:
* Use of C99 comments
* Opening brace on same line as function prototype

ASTERISK-30163 #close

Change-Id: I07771c4c89facd41ce8d323859f022ddbddf6ca7
  • Loading branch information
InterLinked1 authored and jcolp committed Aug 17, 2022
1 parent 9f4db77 commit 85102e4
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions apps/app_mp3.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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 */
Expand Down
1 change: 0 additions & 1 deletion include/asterisk/strings.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

/*!
Expand Down
3 changes: 2 additions & 1 deletion main/channel_internal_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion main/strings.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 85102e4

Please sign in to comment.