mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-25 06:00:36 +00:00 
			
		
		
		
	Various cleanups from comments in an email from Luigi Rizzo. Thank you!
- Use a cleaner syntax for declaring the allocation macros - Fix return value for ast_strdup/ast_strndup - remove safe_strdup from app_macro, since ast_strup does the same thing - fix a place in app_queue where ast_calloc+strncpy was used instead of ast_strdup. If you are helping out with these conversions, please watch out for other places where this is done. - add a note to the coding guidelines about the fix to app_queue git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8065 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -1709,8 +1709,7 @@ static struct localuser *wait_for_answer(struct queue_ent *qe, struct localuser | ||||
| 						if (in->cid.cid_ani) { | ||||
| 							if (o->chan->cid.cid_ani) | ||||
| 								free(o->chan->cid.cid_ani); | ||||
| 							if ((o->chan->cid.cid_ani = ast_calloc(1, strlen(in->cid.cid_ani) + 1))) | ||||
| 								strncpy(o->chan->cid.cid_ani, in->cid.cid_ani, strlen(in->cid.cid_ani) + 1); | ||||
| 							o->chan->cid.cid_ani = ast_strdup(in->cid.cid_ani); | ||||
| 						} | ||||
| 						if (o->chan->cid.cid_rdnis)  | ||||
| 							free(o->chan->cid.cid_rdnis); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user