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 /res | |
| 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 'res')
| -rw-r--r-- | res/res_limit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/res/res_limit.c b/res/res_limit.c index 28a5e1323..b1cf025b0 100644 --- a/res/res_limit.c +++ b/res/res_limit.c @@ -66,7 +66,7 @@ static struct limits { static int str2limit(const char *string) { size_t i; - for (i = 0; i < sizeof(limits) / sizeof(limits[0]); i++) { + for (i = 0; i < ARRAY_LEN(limits); i++) { if (!strcasecmp(string, limits[i].limit)) return limits[i].resource; } @@ -76,7 +76,7 @@ static int str2limit(const char *string) static const char *str2desc(const char *string) { size_t i; - for (i = 0; i < sizeof(limits) / sizeof(limits[0]); i++) { + for (i = 0; i < ARRAY_LEN(limits); i++) { if (!strcmp(string, limits[i].limit)) return limits[i].desc; } @@ -90,7 +90,7 @@ static char *complete_ulimit(struct ast_cli_args *a) if (a->pos > 1) return NULL; - for (i = 0; i < sizeof(limits) / sizeof(limits[0]); i++) { + for (i = 0; i < ARRAY_LEN(limits); i++) { if (!strncasecmp(limits[i].limit, a->word, wordlen)) { if (++which > a->n) return ast_strdup(limits[i].limit); @@ -154,7 +154,7 @@ static char *handle_cli_ulimit(struct ast_cli_entry *e, int cmd, struct ast_cli_ if (a->argc == 1) { char arg2[3]; char *newargv[2] = { "ulimit", arg2 }; - for (resource = 0; resource < sizeof(limits) / sizeof(limits[0]); resource++) { + for (resource = 0; resource < ARRAY_LEN(limits); resource++) { struct ast_cli_args newArgs = { .argv = newargv, .argc = 2 }; ast_copy_string(arg2, limits[resource].limit, sizeof(arg2)); handle_cli_ulimit(e, CLI_HANDLER, &newArgs); |