mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 02:37:10 +00:00 
			
		
		
		
	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: https://origsvn.digium.com/svn/asterisk/trunk@130129 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -754,12 +754,12 @@ static int common_exec(struct ast_channel *chan, struct ast_flags *flags, | ||||
| 			if (mygroup) { | ||||
| 				dup_mygroup = ast_strdupa(mygroup); | ||||
| 				num_mygroups = ast_app_separate_args(dup_mygroup, ':', mygroups, | ||||
| 					sizeof(mygroups) / sizeof(mygroups[0])); | ||||
| 					ARRAY_LEN(mygroups)); | ||||
|  | ||||
| 				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 (y = 0; y < num_mygroups; y++) { | ||||
|   | ||||
| @@ -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, | ||||
|   | ||||
| @@ -1641,7 +1641,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]; | ||||
| @@ -1721,7 +1721,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; | ||||
| @@ -1783,7 +1783,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])) | ||||
| @@ -2005,7 +2005,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) { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user