diff options
author | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-11 18:14:27 +0000 |
---|---|---|
committer | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-11 18:14:27 +0000 |
commit | 2ac6c4648a2723630e959aae1591629d970ac631 (patch) | |
tree | 1b13d56f53f0928bbff8aac6930b0ca9c5d682d4 | |
parent | 5b469417019fcf4923e98c84a4a42f80f1170f0e (diff) |
Merged revisions 130129 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r130129 | bbryant | 2008-07-11 13:09:35 -0500 (Fri, 11 Jul 2008) | 8 lines
Janitor patch to change uses of sizeof to ARRAY_LEN
(closes issue #13054)
Reported by: pabelanger
Patches:
ARRAY_LEN.patch2 uploaded by pabelanger (license 224)
Tested by: seanbright
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130130 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_chanspy.c | 2 | ||||
-rw-r--r-- | apps/app_milliwatt.c | 2 | ||||
-rw-r--r-- | apps/app_minivm.c | 8 | ||||
-rw-r--r-- | channels/chan_dahdi.c | 12 | ||||
-rw-r--r-- | channels/chan_gtalk.c | 4 | ||||
-rw-r--r-- | channels/chan_jingle.c | 4 | ||||
-rw-r--r-- | channels/chan_sip.c | 6 | ||||
-rw-r--r-- | channels/chan_skinny.c | 2 | ||||
-rw-r--r-- | codecs/codec_dahdi.c | 4 | ||||
-rw-r--r-- | codecs/codec_g722.c | 4 | ||||
-rw-r--r-- | codecs/codec_resample.c | 4 | ||||
-rw-r--r-- | main/abstract_jb.c | 2 | ||||
-rw-r--r-- | main/asterisk.c | 6 | ||||
-rw-r--r-- | main/cli.c | 2 | ||||
-rw-r--r-- | main/dsp.c | 2 | ||||
-rw-r--r-- | main/threadstorage.c | 2 | ||||
-rw-r--r-- | main/utils.c | 2 | ||||
-rw-r--r-- | pbx/dundi-parser.c | 2 | ||||
-rw-r--r-- | utils/astman.c | 4 |
19 files changed, 37 insertions, 37 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 992059a4e..6012b3fa7 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -652,7 +652,7 @@ static int common_exec(struct ast_channel *chan, const struct ast_flags *flags, if ((group = pbx_builtin_getvar_helper(peer, "SPYGROUP"))) { dup_group = ast_strdupa(group); num_groups = ast_app_separate_args(dup_group, ':', groups, - sizeof(groups) / sizeof(groups[0])); + ARRAY_LEN(groups)); } for (x = 0; x < num_groups; x++) { diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c index 09d26eca4..57ff4f8db 100644 --- a/apps/app_milliwatt.c +++ b/apps/app_milliwatt.c @@ -64,7 +64,7 @@ static void milliwatt_release(struct ast_channel *chan, void *data) static int milliwatt_generate(struct ast_channel *chan, void *data, int len, int samples) { unsigned char buf[AST_FRIENDLY_OFFSET + 640]; - const int maxsamples = sizeof (buf) / sizeof (buf[0]); + const int maxsamples = ARRAY_LEN(buf); int i, *indexp = (int *) data; struct ast_frame wf = { .frametype = AST_FRAME_VOICE, diff --git a/apps/app_minivm.c b/apps/app_minivm.c index 2b70d87e4..3eb64cda5 100644 --- a/apps/app_minivm.c +++ b/apps/app_minivm.c @@ -1636,7 +1636,7 @@ static int minivm_notify_exec(struct ast_channel *chan, void *data) ast_log(LOG_ERROR, "Out of memory\n"); return -1; } - argc = ast_app_separate_args(tmpptr, ',', argv, sizeof(argv) / sizeof(argv[0])); + argc = ast_app_separate_args(tmpptr, ',', argv, ARRAY_LEN(argv)); if (argc == 2 && !ast_strlen_zero(argv[1])) template = argv[1]; @@ -1706,7 +1706,7 @@ static int minivm_record_exec(struct ast_channel *chan, void *data) ast_log(LOG_ERROR, "Out of memory\n"); return -1; } - argc = ast_app_separate_args(tmp, ',', argv, sizeof(argv) / sizeof(argv[0])); + argc = ast_app_separate_args(tmp, ',', argv, ARRAY_LEN(argv)); if (argc == 2) { if (ast_app_parse_options(minivm_app_options, &flags, opts, argv[1])) { return -1; @@ -1768,7 +1768,7 @@ static int minivm_greet_exec(struct ast_channel *chan, void *data) ast_log(LOG_ERROR, "Out of memory\n"); return -1; } - argc = ast_app_separate_args(tmpptr, ',', argv, sizeof(argv) / sizeof(argv[0])); + argc = ast_app_separate_args(tmpptr, ',', argv, ARRAY_LEN(argv)); if (argc == 2) { if (ast_app_parse_options(minivm_app_options, &flags, opts, argv[1])) @@ -1987,7 +1987,7 @@ static int minivm_accmess_exec(struct ast_channel *chan, void *data) ast_log(LOG_ERROR, "Out of memory\n"); error = TRUE; } else - argc = ast_app_separate_args(tmpptr, ',', argv, sizeof(argv) / sizeof(argv[0])); + argc = ast_app_separate_args(tmpptr, ',', argv, ARRAY_LEN(argv)); } if (argc <=1) { diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 344962756..d8d57537f 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -1349,7 +1349,7 @@ static char *alarm2str(int alarm) static char *event2str(int event) { static char buf[256]; - if ((event < (sizeof(events) / sizeof(events[0]))) && (event > -1)) + if ((event < (ARRAY_LEN(events))) && (event > -1)) return events[event]; sprintf(buf, "Event %d", event); /* safe */ return buf; @@ -6933,7 +6933,7 @@ static void *ss_thread(void *data) break; /* Increment the ringT counter so we can match it against values in chan_dahdi.conf for distinctive ring */ - if (++receivedRingT == (sizeof(curRingData) / sizeof(curRingData[0]))) + if (++receivedRingT == ARRAY_LEN(curRingData)) break; } else if (i & DAHDI_IOMUX_READ) { res = read(p->subs[index].zfd, buf, sizeof(buf)); @@ -7092,7 +7092,7 @@ static void *ss_thread(void *data) break; /* Increment the ringT counter so we can match it against values in chan_dahdi.conf for distinctive ring */ - if (++receivedRingT == (sizeof(curRingData) / sizeof(curRingData[0]))) + if (++receivedRingT == ARRAY_LEN(curRingData)) break; } else if (i & DAHDI_IOMUX_READ) { res = read(p->subs[index].zfd, buf, sizeof(buf)); @@ -7153,7 +7153,7 @@ static void *ss_thread(void *data) break; /* Increment the ringT counter so we can match it against values in chan_dahdi.conf for distinctive ring */ - if (++receivedRingT == (sizeof(curRingData) / sizeof(curRingData[0]))) + if (++receivedRingT == ARRAY_LEN(curRingData)) break; } else if (i & DAHDI_IOMUX_READ) { res = read(p->subs[index].zfd, buf, sizeof(buf)); @@ -13512,7 +13512,7 @@ static void process_echocancel(struct dahdi_chan_conf *confp, const char *data, unsigned int param_count; unsigned int x; - if (!(param_count = ast_app_separate_args(parse, ',', params, sizeof(params) / sizeof(params[0])))) + if (!(param_count = ast_app_separate_args(parse, ',', params, ARRAY_LEN(params))) return; memset(&confp->chan.echocancel, 0, sizeof(confp->chan.echocancel)); @@ -14559,7 +14559,7 @@ static int load_module(void) ast_cli_register_multiple(dahdi_pri_cli, sizeof(dahdi_pri_cli) / sizeof(struct ast_cli_entry)); #endif #ifdef HAVE_SS7 - ast_cli_register_multiple(dahdi_ss7_cli, sizeof(dahdi_ss7_cli) / sizeof(dahdi_ss7_cli[0])); + ast_cli_register_multiple(dahdi_ss7_cli, ARRAY_LEN(dahdi_ss7_cli)); #endif ast_cli_register_multiple(dahdi_cli, sizeof(dahdi_cli) / sizeof(struct ast_cli_entry)); diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index c06f25dc2..2509599ba 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -2000,7 +2000,7 @@ static int load_module(void) } ast_rtp_proto_register(>alk_rtp); - ast_cli_register_multiple(gtalk_cli, sizeof(gtalk_cli) / sizeof(gtalk_cli[0])); + ast_cli_register_multiple(gtalk_cli, ARRAY_LEN(gtalk_cli)); /* Make sure we can register our channel type */ if (ast_channel_register(>alk_tech)) { @@ -2020,7 +2020,7 @@ static int reload(void) static int unload_module(void) { struct gtalk_pvt *privates = NULL; - ast_cli_unregister_multiple(gtalk_cli, sizeof(gtalk_cli) / sizeof(gtalk_cli[0])); + ast_cli_unregister_multiple(gtalk_cli, ARRAY_LEN(gtalk_cli)); /* First, take us out of the channel loop */ ast_channel_unregister(>alk_tech); ast_rtp_proto_unregister(>alk_rtp); diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index a31aa48f2..b47679b0d 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -1875,7 +1875,7 @@ static int load_module(void) } ast_rtp_proto_register(&jingle_rtp); - ast_cli_register_multiple(jingle_cli, sizeof(jingle_cli) / sizeof(jingle_cli[0])); + ast_cli_register_multiple(jingle_cli, ARRAY_LEN(jingle_cli)); /* Make sure we can register our channel type */ if (ast_channel_register(&jingle_tech)) { ast_log(LOG_ERROR, "Unable to register channel class %s\n", type); @@ -1894,7 +1894,7 @@ static int reload(void) static int unload_module(void) { struct jingle_pvt *privates = NULL; - ast_cli_unregister_multiple(jingle_cli, sizeof(jingle_cli) / sizeof(jingle_cli[0])); + ast_cli_unregister_multiple(jingle_cli, ARRAY_LEN(jingle_cli)); /* First, take us out of the channel loop */ ast_channel_unregister(&jingle_tech); ast_rtp_proto_unregister(&jingle_rtp); diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 99eb2df8d..eca6f276b 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -2400,7 +2400,7 @@ static int find_sip_method(const char *msg) if (ast_strlen_zero(msg)) return 0; - for (i = 1; i < (sizeof(sip_methods) / sizeof(sip_methods[0])) && !res; i++) { + for (i = 1; i < (ARRAY_LEN(sip_methods)) && !res; i++) { if (method_match(i, msg)) res = sip_methods[i].id; } @@ -13179,7 +13179,7 @@ static const char *subscription_type2str(enum subscriptiontype subtype) { int i; - for (i = 1; (i < (sizeof(subscription_types) / sizeof(subscription_types[0]))); i++) { + for (i = 1; i < ARRAY_LEN(subscription_types); i++) { if (subscription_types[i].type == subtype) { return subscription_types[i].text; } @@ -13192,7 +13192,7 @@ static const struct cfsubscription_types *find_subscription_type(enum subscripti { int i; - for (i = 1; (i < (sizeof(subscription_types) / sizeof(subscription_types[0]))); i++) { + for (i = 1; i < ARRAY_LEN(subscription_types); i++) { if (subscription_types[i].type == subtype) { return &subscription_types[i]; } diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 43e566aaa..0c9827baf 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -6092,7 +6092,7 @@ static int load_module(void) { int res = 0; - for (; res < (sizeof(soft_key_template_default) / sizeof(soft_key_template_default[0])); res++) { + for (; res < ARRAY_LEN(soft_key_template_default); res++) { soft_key_template_default[res].softKeyEvent = htolel(soft_key_template_default[res].softKeyEvent); } /* load and parse config */ diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c index 76661e6c4..f570584fa 100644 --- a/codecs/codec_dahdi.c +++ b/codecs/codec_dahdi.c @@ -466,7 +466,7 @@ static int reload(void) static int unload_module(void) { - ast_cli_unregister_multiple(cli, sizeof(cli) / sizeof(cli[0])); + ast_cli_unregister_multiple(cli, ARRAY_LEN(cli)); unregister_translators(); return 0; @@ -477,7 +477,7 @@ static int load_module(void) if (parse_config(0)) return AST_MODULE_LOAD_DECLINE; find_transcoders(); - ast_cli_register_multiple(cli, sizeof(cli) / sizeof(cli[0])); + ast_cli_register_multiple(cli, ARRAY_LEN(cli)); return AST_MODULE_LOAD_SUCCESS; } diff --git a/codecs/codec_g722.c b/codecs/codec_g722.c index 02f4720cd..acca1fc87 100644 --- a/codecs/codec_g722.c +++ b/codecs/codec_g722.c @@ -166,7 +166,7 @@ static struct ast_frame *lintog722_sample (void) .frametype = AST_FRAME_VOICE, .subclass = AST_FORMAT_SLINEAR, .datalen = sizeof(slin_g722_ex), - .samples = sizeof(slin_g722_ex) / sizeof(slin_g722_ex[0]), + .samples = ARRAY_LEN(slin_g722_ex), .src = __PRETTY_FUNCTION__, .data = slin_g722_ex, }; @@ -180,7 +180,7 @@ static struct ast_frame *lin16tog722_sample (void) .frametype = AST_FRAME_VOICE, .subclass = AST_FORMAT_SLINEAR16, .datalen = sizeof(slin_g722_ex), - .samples = sizeof(slin_g722_ex) / sizeof(slin_g722_ex[0]), + .samples = ARRAY_LEN(slin_g722_ex), .src = __PRETTY_FUNCTION__, .data = slin_g722_ex, }; diff --git a/codecs/codec_resample.c b/codecs/codec_resample.c index 251d99c23..988384af4 100644 --- a/codecs/codec_resample.c +++ b/codecs/codec_resample.c @@ -166,7 +166,7 @@ static struct ast_frame *slin16_to_slin8_sample(void) .frametype = AST_FRAME_VOICE, .subclass = AST_FORMAT_SLINEAR16, .datalen = sizeof(slin16_slin8_ex), - .samples = sizeof(slin16_slin8_ex) / sizeof(slin16_slin8_ex[0]), + .samples = ARRAY_LEN(slin16_slin8_ex), .src = __PRETTY_FUNCTION__, .data = slin16_slin8_ex, }; @@ -180,7 +180,7 @@ static struct ast_frame *slin8_to_slin16_sample(void) .frametype = AST_FRAME_VOICE, .subclass = AST_FORMAT_SLINEAR, .datalen = sizeof(slin8_slin16_ex), - .samples = sizeof(slin8_slin16_ex) / sizeof(slin8_slin16_ex[0]), + .samples = ARRAY_LEN(slin8_slin16_ex), .src = __PRETTY_FUNCTION__, .data = slin8_slin16_ex, }; diff --git a/main/abstract_jb.c b/main/abstract_jb.c index 557e5c205..29338a97b 100644 --- a/main/abstract_jb.c +++ b/main/abstract_jb.c @@ -176,7 +176,7 @@ static void jb_choose_impl(struct ast_channel *chan) struct ast_jb *jb = &chan->jb; struct ast_jb_conf *jbconf = &jb->conf; struct ast_jb_impl *test_impl; - int i, avail_impl_count = sizeof(avail_impl) / sizeof(avail_impl[0]); + int i, avail_impl_count = ARRAY_LEN(avail_impl); jb->impl = &avail_impl[default_impl]; diff --git a/main/asterisk.c b/main/asterisk.c index 02ffb25e0..2080f207d 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -2874,9 +2874,9 @@ int main(int argc, char *argv[]) char *remotesock = NULL; /* Remember original args for restart */ - if (argc > sizeof(_argv) / sizeof(_argv[0]) - 1) { - fprintf(stderr, "Truncating argument size to %d\n", (int)(sizeof(_argv) / sizeof(_argv[0])) - 1); - argc = sizeof(_argv) / sizeof(_argv[0]) - 1; + if (argc > ARRAY_LEN(_argv) - 1) { + fprintf(stderr, "Truncating argument size to %d\n", (int)ARRAY_LEN(_argv) - 1); + argc = ARRAY_LEN(_argv) - 1; } for (x = 0; x < argc; x++) _argv[x] = argv[x]; diff --git a/main/cli.c b/main/cli.c index fa9bdfabc..ef8540572 100644 --- a/main/cli.c +++ b/main/cli.c @@ -1777,7 +1777,7 @@ static char *__ast_cli_generator(const char *text, const char *word, int state, char matchstr[80] = ""; int tws = 0; /* Split the argument into an array of words */ - char *dup = parse_args(text, &x, argv, sizeof(argv) / sizeof(argv[0]), &tws); + char *dup = parse_args(text, &x, argv, ARRAY_LEN(argv), &tws); if (!dup) /* malloc error */ return NULL; diff --git a/main/dsp.c b/main/dsp.c index f24030ebb..72be1da5e 100644 --- a/main/dsp.c +++ b/main/dsp.c @@ -1372,7 +1372,7 @@ static void ast_dsp_prog_reset(struct ast_dsp *dsp) dsp->gsamp_size = modes[dsp->progmode].size; dsp->gsamps = 0; - for (x = 0; x < sizeof(modes[dsp->progmode].freqs) / sizeof(modes[dsp->progmode].freqs[0]); x++) { + for (x = 0; x < ARRAY_LEN(modes[dsp->progmode].freqs); x++) { if (modes[dsp->progmode].freqs[x]) { goertzel_init(&dsp->freqs[x], (float)modes[dsp->progmode].freqs[x], dsp->gsamp_size); max = x + 1; diff --git a/main/threadstorage.c b/main/threadstorage.c index ae1719ff8..94ea45d4e 100644 --- a/main/threadstorage.c +++ b/main/threadstorage.c @@ -232,7 +232,7 @@ static struct ast_cli_entry cli[] = { void threadstorage_init(void) { - ast_cli_register_multiple(cli, sizeof(cli) / sizeof(cli[0])); + ast_cli_register_multiple(cli, ARRAY_LEN(cli)); } #endif /* !defined(DEBUG_THREADLOCALS) */ diff --git a/main/utils.c b/main/utils.c index 1a7043573..6a435249e 100644 --- a/main/utils.c +++ b/main/utils.c @@ -1616,7 +1616,7 @@ int ast_utils_init(void) base64_init(); #ifdef DEBUG_THREADS #if !defined(LOW_MEMORY) - ast_cli_register_multiple(utils_cli, sizeof(utils_cli) / sizeof(utils_cli[0])); + ast_cli_register_multiple(utils_cli, ARRAY_LEN(utils_cli)); #endif #endif return 0; diff --git a/pbx/dundi-parser.c b/pbx/dundi-parser.c index 05632a785..0195e3adc 100644 --- a/pbx/dundi-parser.c +++ b/pbx/dundi-parser.c @@ -215,7 +215,7 @@ static void dump_cause(char *output, int maxlen, void *value, int len) memcpy(tmp2, cause->desc, datalen); tmp2[datalen] = '\0'; - if (causecode < sizeof(causes) / sizeof(causes[0])) { + if (causecode < ARRAY_LEN(causes)) { if (ast_strlen_zero(tmp2)) snprintf(output, maxlen, "%s", causes[causecode]); else diff --git a/utils/astman.c b/utils/astman.c index f674105a5..6c8d74291 100644 --- a/utils/astman.c +++ b/utils/astman.c @@ -258,14 +258,14 @@ static int process_message(struct ast_mansession *s, struct message *m) fprintf(stderr, "Missing event in request"); return 0; } - for (x=0;x<sizeof(events) / sizeof(events[0]);x++) { + for (x = 0; x < ARRAY_LEN(events); x++) { if (!strcasecmp(event, events[x].event)) { if (events[x].func(s, m)) return -1; break; } } - if (x >= sizeof(events) / sizeof(events[0])) + if (x >= ARRAY_LEN(events)) fprintf(stderr, "Ignoring unknown event '%s'", event); #if 0 for (x=0;x<m->hdrcount;x++) { |