diff options
author | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-08 16:41:31 +0000 |
---|---|---|
committer | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-08 16:41:31 +0000 |
commit | 3b5c2f2ec9a1f1b932a72c54ec99f2ade7b874e5 (patch) | |
tree | 2e4756c8d1b95bdec564a84466c61973aa5e336e /main/callerid.c | |
parent | b2d0a411d289307a4a22e2647d0ad5540542de01 (diff) |
Merged revisions 129045 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r129045 | bbryant | 2008-07-08 11:40:28 -0500 (Tue, 08 Jul 2008) | 7 lines
Janitor project to convert sizeof to ARRAY_LEN macro.
(closes issue #13002)
Reported by: caio1982
Patches:
janitor_arraylen5.diff uploaded by caio1982 (license 22)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@129046 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/callerid.c')
-rw-r--r-- | main/callerid.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/callerid.c b/main/callerid.c index 4dd290e5a..f256ded8b 100644 --- a/main/callerid.c +++ b/main/callerid.c @@ -1074,7 +1074,7 @@ int ast_parse_caller_presentation(const char *data) { int i; - for (i = 0; i < ((sizeof(pres_types) / sizeof(pres_types[0]))); i++) { + for (i = 0; i < ARRAY_LEN(pres_types); i++) { if (!strcasecmp(pres_types[i].name, data)) return pres_types[i].val; } @@ -1090,7 +1090,7 @@ const char *ast_describe_caller_presentation(int data) { int i; - for (i = 0; i < ((sizeof(pres_types) / sizeof(pres_types[0]))); i++) { + for (i = 0; i < ARRAY_LEN(pres_types); i++) { if (pres_types[i].val == data) return pres_types[i].description; } @@ -1106,7 +1106,7 @@ const char *ast_named_caller_presentation(int data) { int i; - for (i = 0; i < ((sizeof(pres_types) / sizeof(pres_types[0]))); i++) { + for (i = 0; i < ARRAY_LEN(pres_types); i++) { if (pres_types[i].val == data) return pres_types[i].name; } |