kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 19:38:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Simplify a line with ARRAY_LEN()

Browse Source 
- Make a few little formatting changes


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100532 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-01-28 04:30:44 +00:00
parent 79be2b8b0e
commit e8f7cbf358
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/channel.c
View File

@@ -4561,14 +4561,14 @@ void ast_moh_cleanup(struct ast_channel *chan)
void ast_channels_init(void) void ast_channels_init(void)
{ {
ast_cli_register_multiple(cli_channel, sizeof(cli_channel) / sizeof(struct ast_cli_entry)); ast_cli_register_multiple(cli_channel, ARRAY_LEN(cli_channel));
} }
/*! \brief Print call group and pickup group ---*/ /*! \brief Print call group and pickup group ---*/
char *ast_print_group(char *buf, int buflen, ast_group_t group) char *ast_print_group(char *buf, int buflen, ast_group_t group)
{ {
unsigned int i; unsigned int i;
int first=1; int first = 1;
char num[3]; char num[3];
buf[0] = '\0'; buf[0] = '\0';
@@ -4581,7 +4581,7 @@ char *ast_print_group(char *buf, int buflen, ast_group_t group)
if (!first) { if (!first) {
strncat(buf, ", ", buflen); strncat(buf, ", ", buflen);
} else { } else {
first=0; first = 0;
} }
snprintf(num, sizeof(num), "%u", i); snprintf(num, sizeof(num), "%u", i);
strncat(buf, num, buflen); strncat(buf, num, buflen);
@@ -4619,9 +4619,12 @@ static int silence_generator_generate(struct ast_channel *chan, void *data, int
.samples = samples, .samples = samples,
.datalen = sizeof(buf), .datalen = sizeof(buf),
}; };
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
if (ast_write(chan, &frame)) if (ast_write(chan, &frame))
return -1; return -1;
return 0; return 0;
} }