From 87800e19133eb824568b8c2d71757b32f8b5fcf4 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Mon, 28 Jan 2008 04:43:14 +0000 Subject: Make a couple more uses of ARRAY_LEN, and convert some spaces to tabs git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100533 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/channel.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'main/channel.c') diff --git a/main/channel.c b/main/channel.c index cfd041819..3553a3f1b 100644 --- a/main/channel.c +++ b/main/channel.c @@ -481,7 +481,7 @@ const char *ast_cause2str(int cause) { 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) return causes[x].desc; } @@ -494,8 +494,8 @@ int ast_str2cause(const char *name) { int x; - for (x = 0; x < sizeof(causes) / sizeof(causes[0]); x++) - if (strncasecmp(causes[x].name, name, strlen(causes[x].name)) == 0) + for (x = 0; x < ARRAY_LEN(causes); x++) + if (!strncasecmp(causes[x].name, name, strlen(causes[x].name))) return causes[x].cause; return -1; @@ -4806,44 +4806,45 @@ int ast_channel_trylock(struct ast_channel *chan) int ast_say_number(struct ast_channel *chan, int num, 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, 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, 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, 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, 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, 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, const char *ints, const char *lang, int audiofd, int ctrlfd) { - char buf[256]; + char buf[256]; - snprintf(buf, sizeof(buf), "%d", num); - return ast_say_digit_str_full(chan, buf, ints, lang, audiofd, ctrlfd); + snprintf(buf, sizeof(buf), "%d", num); + + return ast_say_digit_str_full(chan, buf, ints, lang, audiofd, ctrlfd); } -- cgit v1.2.3