diff options
author | eliel <eliel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-05 10:31:25 +0000 |
---|---|---|
committer | eliel <eliel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-05 10:31:25 +0000 |
commit | 6e243a54348da179538728d0c25526081bc17bf6 (patch) | |
tree | 40ec75ed7395fbf915cca96602558681eac3dd0d /channels | |
parent | c16842dfcda6e092e143e0a2e77f6d3d8d25e7cf (diff) |
Janitor, use ARRAY_LEN() when possible.
(closes issue #13990)
Reported by: eliel
Patches:
array_len.diff uploaded by eliel (license 64)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@161218 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_agent.c | 4 | ||||
-rw-r--r-- | channels/chan_alsa.c | 4 | ||||
-rw-r--r-- | channels/chan_dahdi.c | 4 | ||||
-rw-r--r-- | channels/chan_iax2.c | 4 | ||||
-rw-r--r-- | channels/chan_oss.c | 4 | ||||
-rw-r--r-- | channels/chan_sip.c | 4 | ||||
-rw-r--r-- | channels/chan_skinny.c | 4 | ||||
-rw-r--r-- | channels/chan_usbradio.c | 4 |
8 files changed, 16 insertions, 16 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 78bdb5a20..ded6225c3 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -2600,7 +2600,7 @@ static int load_module(void) ast_manager_register2("AgentLogoff", EVENT_FLAG_AGENT, action_agent_logoff, "Sets an agent as no longer logged in", mandescr_agent_logoff); /* CLI Commands */ - ast_cli_register_multiple(cli_agents, sizeof(cli_agents) / sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(cli_agents, ARRAY_LEN(cli_agents)); /* Dialplan Functions */ ast_custom_function_register(&agent_function); @@ -2632,7 +2632,7 @@ static int unload_module(void) /* Unregister dialplan functions */ ast_custom_function_unregister(&agent_function); /* Unregister CLI commands */ - ast_cli_unregister_multiple(cli_agents, sizeof(cli_agents) / sizeof(struct ast_cli_entry)); + ast_cli_unregister_multiple(cli_agents, ARRAY_LEN(cli_agents)); /* Unregister dialplan applications */ ast_unregister_application(app); ast_unregister_application(app3); diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index 30c728a42..991f2c2bb 100644 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -902,7 +902,7 @@ static int load_module(void) return AST_MODULE_LOAD_FAILURE; } - ast_cli_register_multiple(cli_alsa, sizeof(cli_alsa) / sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(cli_alsa, ARRAY_LEN(cli_alsa)); return AST_MODULE_LOAD_SUCCESS; } @@ -910,7 +910,7 @@ static int load_module(void) static int unload_module(void) { ast_channel_unregister(&alsa_tech); - ast_cli_unregister_multiple(cli_alsa, sizeof(cli_alsa) / sizeof(struct ast_cli_entry)); + ast_cli_unregister_multiple(cli_alsa, ARRAY_LEN(cli_alsa)); if (alsa.icard) snd_pcm_close(alsa.icard); diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index cbe459291..9e615e9e7 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -13616,10 +13616,10 @@ static int __unload_module(void) if (linksets[i].master != AST_PTHREADT_NULL) pthread_cancel(linksets[i].master); } - ast_cli_unregister_multiple(dahdi_ss7_cli, sizeof(dahdi_ss7_cli) / sizeof(struct ast_cli_entry)); + ast_cli_unregister_multiple(dahdi_ss7_cli, ARRAY_LEN(dahdi_ss7_cli)); #endif - ast_cli_unregister_multiple(dahdi_cli, sizeof(dahdi_cli) / sizeof(struct ast_cli_entry)); + ast_cli_unregister_multiple(dahdi_cli, ARRAY_LEN(dahdi_cli)); ast_manager_unregister( "DAHDIDialOffhook" ); ast_manager_unregister( "DAHDIHangup" ); ast_manager_unregister( "DAHDITransfer" ); diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 1c1888a1e..74c25998a 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -12437,7 +12437,7 @@ static int __unload_module(void) ast_manager_unregister( "IAXnetstats" ); ast_manager_unregister( "IAXregistry" ); ast_unregister_application(papp); - ast_cli_unregister_multiple(cli_iax2, sizeof(cli_iax2) / sizeof(struct ast_cli_entry)); + ast_cli_unregister_multiple(cli_iax2, ARRAY_LEN(cli_iax2)); ast_unregister_switch(&iax2_switch); ast_channel_unregister(&iax2_tech); delete_users(); @@ -12564,7 +12564,7 @@ static int load_module(void) } ast_netsock_init(outsock); - ast_cli_register_multiple(cli_iax2, sizeof(cli_iax2) / sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(cli_iax2, ARRAY_LEN(cli_iax2)); ast_register_application_xml(papp, iax2_prov_app); diff --git a/channels/chan_oss.c b/channels/chan_oss.c index 72ab78cd2..b3f0f71bc 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -1464,7 +1464,7 @@ static int load_module(void) return AST_MODULE_LOAD_FAILURE; } - ast_cli_register_multiple(cli_oss, sizeof(cli_oss) / sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(cli_oss, ARRAY_LEN(cli_oss)); return AST_MODULE_LOAD_SUCCESS; } @@ -1475,7 +1475,7 @@ static int unload_module(void) struct chan_oss_pvt *o, *next; ast_channel_unregister(&oss_tech); - ast_cli_unregister_multiple(cli_oss, sizeof(cli_oss) / sizeof(struct ast_cli_entry)); + ast_cli_unregister_multiple(cli_oss, ARRAY_LEN(cli_oss)); o = oss_default.next; while (o) { diff --git a/channels/chan_sip.c b/channels/chan_sip.c index a07cac241..a5ec482e5 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -23864,7 +23864,7 @@ static int load_module(void) } /* Register all CLI functions for SIP */ - ast_cli_register_multiple(cli_sip, sizeof(cli_sip)/ sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(cli_sip, ARRAY_LEN(cli_sip)); /* Tell the RTP subdriver that we're here */ ast_rtp_proto_register(&sip_rtp); @@ -23938,7 +23938,7 @@ static int unload_module(void) ast_unregister_application(app_sipaddheader); /* Unregister CLI commands */ - ast_cli_unregister_multiple(cli_sip, sizeof(cli_sip) / sizeof(struct ast_cli_entry)); + ast_cli_unregister_multiple(cli_sip, ARRAY_LEN(cli_sip)); /* Disconnect from the RTP subsystem */ ast_rtp_proto_unregister(&sip_rtp); diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index f61f1b0b3..9d6ba0b57 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -6803,7 +6803,7 @@ static int load_module(void) } ast_rtp_proto_register(&skinny_rtp); - ast_cli_register_multiple(cli_skinny, sizeof(cli_skinny) / sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(cli_skinny, ARRAY_LEN(cli_skinny)); sched = sched_context_create(); if (!sched) { ast_log(LOG_WARNING, "Unable to create schedule context\n"); @@ -6828,7 +6828,7 @@ static int unload_module(void) ast_rtp_proto_unregister(&skinny_rtp); ast_channel_unregister(&skinny_tech); - ast_cli_unregister_multiple(cli_skinny, sizeof(cli_skinny) / sizeof(struct ast_cli_entry)); + ast_cli_unregister_multiple(cli_skinny, ARRAY_LEN(cli_skinny)); AST_LIST_LOCK(&sessions); /* Destroy all the interfaces and free their memory */ diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c index 2e55448e0..2a829a685 100644 --- a/channels/chan_usbradio.c +++ b/channels/chan_usbradio.c @@ -3984,7 +3984,7 @@ static int load_module(void) return AST_MODULE_LOAD_FAILURE; } - ast_cli_register_multiple(cli_usbradio, sizeof(cli_usbradio) / sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(cli_usbradio, ARRAY_LEN(cli_usbradio)); return AST_MODULE_LOAD_SUCCESS; } @@ -3997,7 +3997,7 @@ static int unload_module(void) ast_log(LOG_WARNING, "unload_module() called\n"); ast_channel_unregister(&usbradio_tech); - ast_cli_unregister_multiple(cli_usbradio, sizeof(cli_usbradio) / sizeof(struct ast_cli_entry)); + ast_cli_unregister_multiple(cli_usbradio, ARRAY_LEN(cli_usbradio)); for (o = usbradio_default.next; o; o = o->next) { |