diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/asterisk.c | 2 | ||||
| -rw-r--r-- | main/astmm.c | 2 | ||||
| -rw-r--r-- | main/cli.c | 2 | ||||
| -rw-r--r-- | main/config.c | 2 | ||||
| -rw-r--r-- | main/db.c | 2 | ||||
| -rw-r--r-- | main/features.c | 2 | ||||
| -rw-r--r-- | main/file.c | 2 | ||||
| -rw-r--r-- | main/frame.c | 2 | ||||
| -rw-r--r-- | main/http.c | 2 | ||||
| -rw-r--r-- | main/logger.c | 2 | ||||
| -rw-r--r-- | main/manager.c | 2 | ||||
| -rw-r--r-- | main/pbx.c | 4 | ||||
| -rw-r--r-- | main/translate.c | 2 | ||||
| -rw-r--r-- | main/udptl.c | 2 |
14 files changed, 15 insertions, 15 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index bef3cba49..250b55271 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3443,7 +3443,7 @@ int main(int argc, char *argv[]) #endif ast_lastreloadtime = ast_startuptime = ast_tvnow(); - ast_cli_register_multiple(cli_asterisk, sizeof(cli_asterisk) / sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(cli_asterisk, ARRAY_LEN(cli_asterisk)); run_startup_commands(); diff --git a/main/astmm.c b/main/astmm.c index b1d34dd5f..3b3a671a9 100644 --- a/main/astmm.c +++ b/main/astmm.c @@ -487,7 +487,7 @@ void __ast_mm_init(void) ast_log(LOG_ERROR, "struct ast_region has %d bytes of padding! This must be eliminated for low-fence checking to work properly!\n", (int) pad); } - ast_cli_register_multiple(cli_memory, sizeof(cli_memory) / sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(cli_memory, ARRAY_LEN(cli_memory)); snprintf(filename, sizeof(filename), "%s/mmlog", ast_config_AST_LOG_DIR); diff --git a/main/cli.c b/main/cli.c index a01b343e3..e590046e8 100644 --- a/main/cli.c +++ b/main/cli.c @@ -1602,7 +1602,7 @@ int ast_cli_perms_init(int reload) /*! \brief initialize the _full_cmd string in * each of the builtins. */ void ast_builtins_init(void) { - ast_cli_register_multiple(cli_cli, sizeof(cli_cli) / sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(cli_cli, ARRAY_LEN(cli_cli)); } /*! diff --git a/main/config.c b/main/config.c index d6510dfbe..5fad1c51b 100644 --- a/main/config.c +++ b/main/config.c @@ -2538,6 +2538,6 @@ static struct ast_cli_entry cli_config[] = { int register_config_cli() { - ast_cli_register_multiple(cli_config, sizeof(cli_config) / sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(cli_config, ARRAY_LEN(cli_config)); return 0; } @@ -662,7 +662,7 @@ static int manager_dbdeltree(struct mansession *s, const struct message *m) int astdb_init(void) { dbinit(); - ast_cli_register_multiple(cli_database, sizeof(cli_database) / sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(cli_database, ARRAY_LEN(cli_database)); ast_manager_register("DBGet", EVENT_FLAG_SYSTEM | EVENT_FLAG_REPORTING, manager_dbget, "Get DB Entry"); ast_manager_register("DBPut", EVENT_FLAG_SYSTEM, manager_dbput, "Put DB Entry"); ast_manager_register("DBDel", EVENT_FLAG_SYSTEM, manager_dbdel, "Delete DB Entry"); diff --git a/main/features.c b/main/features.c index 1df9982db..68841f485 100644 --- a/main/features.c +++ b/main/features.c @@ -4194,7 +4194,7 @@ int ast_features_init(void) if ((res = load_config())) return res; - ast_cli_register_multiple(cli_features, sizeof(cli_features) / sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(cli_features, ARRAY_LEN(cli_features)); ast_pthread_create(&parking_thread, NULL, do_parking_thread, NULL); res = ast_register_application2(parkedcall, park_exec, NULL, NULL, NULL); if (!res) diff --git a/main/file.c b/main/file.c index 61d45fe1c..b2ebfd79d 100644 --- a/main/file.c +++ b/main/file.c @@ -1347,6 +1347,6 @@ struct ast_cli_entry cli_file[] = { int ast_file_init(void) { - ast_cli_register_multiple(cli_file, sizeof(cli_file) / sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(cli_file, ARRAY_LEN(cli_file)); return 0; } diff --git a/main/frame.c b/main/frame.c index 8c0982b8c..8e96b19e1 100644 --- a/main/frame.c +++ b/main/frame.c @@ -942,7 +942,7 @@ static struct ast_cli_entry my_clis[] = { int init_framer(void) { - ast_cli_register_multiple(my_clis, sizeof(my_clis) / sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(my_clis, ARRAY_LEN(my_clis)); return 0; } diff --git a/main/http.c b/main/http.c index 0e59146a4..5c3aa7895 100644 --- a/main/http.c +++ b/main/http.c @@ -1024,7 +1024,7 @@ int ast_http_init(void) { ast_http_uri_link(&statusuri); ast_http_uri_link(&staticuri); - ast_cli_register_multiple(cli_http, sizeof(cli_http) / sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(cli_http, ARRAY_LEN(cli_http)); return __ast_http_load(0); } diff --git a/main/logger.c b/main/logger.c index 58813edda..b42a21b19 100644 --- a/main/logger.c +++ b/main/logger.c @@ -1013,7 +1013,7 @@ int init_logger(void) } /* register the logger cli commands */ - ast_cli_register_multiple(cli_logger, sizeof(cli_logger) / sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(cli_logger, ARRAY_LEN(cli_logger)); ast_mkdir(ast_config_AST_LOG_DIR, 0777); diff --git a/main/manager.c b/main/manager.c index acb2fa68d..945e369df 100644 --- a/main/manager.c +++ b/main/manager.c @@ -4014,7 +4014,7 @@ static int __init_manager(int reload) ast_manager_register2("ModuleLoad", EVENT_FLAG_SYSTEM, manager_moduleload, "Module management", mandescr_moduleload); ast_manager_register2("ModuleCheck", EVENT_FLAG_SYSTEM, manager_modulecheck, "Check if module is loaded", mandescr_modulecheck); - ast_cli_register_multiple(cli_manager, sizeof(cli_manager) / sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(cli_manager, ARRAY_LEN(cli_manager)); ast_extension_state_add(NULL, NULL, manager_state_cb, NULL); registered = 1; /* Append placeholder event so master_eventq never runs dry */ diff --git a/main/pbx.c b/main/pbx.c index 1e6ce170e..533c4dc43 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -9052,11 +9052,11 @@ int load_pbx(void) } ast_verb(1, "Registering builtin applications:\n"); - ast_cli_register_multiple(pbx_cli, sizeof(pbx_cli) / sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(pbx_cli, ARRAY_LEN(pbx_cli)); __ast_custom_function_register(&exception_function, NULL); /* Register builtin applications */ - for (x = 0; x < sizeof(builtins) / sizeof(struct pbx_builtin); x++) { + for (x = 0; x < ARRAY_LEN(builtins); x++) { ast_verb(1, "[%s]\n", builtins[x].name); if (ast_register_application2(builtins[x].name, builtins[x].execute, NULL, NULL, NULL)) { ast_log(LOG_ERROR, "Unable to register builtin application '%s'\n", builtins[x].name); diff --git a/main/translate.c b/main/translate.c index 226a9500c..35c1968df 100644 --- a/main/translate.c +++ b/main/translate.c @@ -676,7 +676,7 @@ int __ast_register_translator(struct ast_translator *t, struct ast_module *mod) ast_getformatname(1 << t->srcfmt), ast_getformatname(1 << t->dstfmt), t->cost); if (!added_cli) { - ast_cli_register_multiple(cli_translate, sizeof(cli_translate) / sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(cli_translate, ARRAY_LEN(cli_translate)); added_cli++; } diff --git a/main/udptl.c b/main/udptl.c index 166e0dab0..52f7c99f2 100644 --- a/main/udptl.c +++ b/main/udptl.c @@ -1245,6 +1245,6 @@ int ast_udptl_reload(void) void ast_udptl_init(void) { - ast_cli_register_multiple(cli_udptl, sizeof(cli_udptl) / sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(cli_udptl, ARRAY_LEN(cli_udptl)); __ast_udptl_reload(0); } |