kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make a couple more uses of ARRAY_LEN, and convert some spaces to tabs

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100533 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-01-28 04:43:14 +00:00
parent e8f7cbf358
commit 87800e1913
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
main/channel.c
View File

@@ -481,7 +481,7 @@ const char *ast_cause2str(int cause)
{ {
int x; int x;
for (x=0; x < sizeof(causes) / sizeof(causes[0]); x++) { for (x = 0; x < ARRAY_LEN(causes); x++) {
if (causes[x].cause == cause) if (causes[x].cause == cause)
return causes[x].desc; return causes[x].desc;
} }
@@ -494,8 +494,8 @@ int ast_str2cause(const char *name)
{ {
int x; int x;
for (x = 0; x < sizeof(causes) / sizeof(causes[0]); x++) for (x = 0; x < ARRAY_LEN(causes); x++)
if (strncasecmp(causes[x].name, name, strlen(causes[x].name)) == 0) if (!strncasecmp(causes[x].name, name, strlen(causes[x].name)))
return causes[x].cause; return causes[x].cause;
return -1; return -1;
@@ -4806,44 +4806,45 @@ int ast_channel_trylock(struct ast_channel *chan)
int ast_say_number(struct ast_channel *chan, int num, int ast_say_number(struct ast_channel *chan, int num,
const char *ints, const char *language, const char *options) const char *ints, const char *language, const char *options)
{ {
return ast_say_number_full(chan, num, ints, language, options, -1, -1); return ast_say_number_full(chan, num, ints, language, options, -1, -1);
} }
int ast_say_enumeration(struct ast_channel *chan, int num, int ast_say_enumeration(struct ast_channel *chan, int num,
const char *ints, const char *language, const char *options) const char *ints, const char *language, const char *options)
{ {
return ast_say_enumeration_full(chan, num, ints, language, options, -1, -1); return ast_say_enumeration_full(chan, num, ints, language, options, -1, -1);
} }
int ast_say_digits(struct ast_channel *chan, int num, int ast_say_digits(struct ast_channel *chan, int num,
const char *ints, const char *lang) const char *ints, const char *lang)
{ {
return ast_say_digits_full(chan, num, ints, lang, -1, -1); return ast_say_digits_full(chan, num, ints, lang, -1, -1);
} }
int ast_say_digit_str(struct ast_channel *chan, const char *str, int ast_say_digit_str(struct ast_channel *chan, const char *str,
const char *ints, const char *lang) const char *ints, const char *lang)
{ {
return ast_say_digit_str_full(chan, str, ints, lang, -1, -1); return ast_say_digit_str_full(chan, str, ints, lang, -1, -1);
} }
int ast_say_character_str(struct ast_channel *chan, const char *str, int ast_say_character_str(struct ast_channel *chan, const char *str,
const char *ints, const char *lang) const char *ints, const char *lang)
{ {
return ast_say_character_str_full(chan, str, ints, lang, -1, -1); return ast_say_character_str_full(chan, str, ints, lang, -1, -1);
} }
int ast_say_phonetic_str(struct ast_channel *chan, const char *str, int ast_say_phonetic_str(struct ast_channel *chan, const char *str,
const char *ints, const char *lang) const char *ints, const char *lang)
{ {
return ast_say_phonetic_str_full(chan, str, ints, lang, -1, -1); return ast_say_phonetic_str_full(chan, str, ints, lang, -1, -1);
} }
int ast_say_digits_full(struct ast_channel *chan, int num, int ast_say_digits_full(struct ast_channel *chan, int num,
const char *ints, const char *lang, int audiofd, int ctrlfd) const char *ints, const char *lang, int audiofd, int ctrlfd)
{ {
char buf[256]; char buf[256];
snprintf(buf, sizeof(buf), "%d", num); snprintf(buf, sizeof(buf), "%d", num);
return ast_say_digit_str_full(chan, buf, ints, lang, audiofd, ctrlfd);
return ast_say_digit_str_full(chan, buf, ints, lang, audiofd, ctrlfd);
} }