[Asterisk-cvs] asterisk translate.c,1.38,1.39

[russell at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv31325

Modified Files:
	translate.c 
Log Message:
print out which format was bigger than MAX_FORMAT


Index: translate.c
===================================================================
RCS file: /usr/cvsroot/asterisk/translate.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- translate.c	6 Jun 2005 22:12:18 -0000	1.38
+++ translate.c	5 Jul 2005 14:00:03 -0000	1.39
@@ -43,7 +43,7 @@
 
 struct ast_translator_dir {
 	struct ast_translator *step;	/* Next step translator */
-	int cost;						/* Complete cost to destination */
+	int cost;			/* Complete cost to destination */
 };
 
 struct ast_frame_delivery {
@@ -396,8 +396,12 @@
 	char tmp[80];
 	t->srcfmt = powerof(t->srcfmt);
 	t->dstfmt = powerof(t->dstfmt);
-	if ((t->srcfmt >= MAX_FORMAT) || (t->dstfmt >= MAX_FORMAT)) {
-		ast_log(LOG_WARNING, "Format %s is larger than MAX_FORMAT\n", ast_getformatname(t->srcfmt));
+	if (t->srcfmt >= MAX_FORMAT) {
+		ast_log(LOG_WARNING, "Source format %s is larger than MAX_FORMAT\n", ast_getformatname(t->srcfmt));
+		return -1;
+	}
+	if (t->dstfmt >= MAX_FORMAT) {
+		ast_log(LOG_WARNING, "Destination format %s is larger than MAX_FORMAT\n", ast_getformatname(t->dstfmt));
 		return -1;
 	}
 	calc_cost(t,1);