add patches to Asterisk for 1.2 bugs

git-svn-id: svn://192.168.202.10@268 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2006-09-11 16:18:53 +00:00
parent 0acd5a76db
commit 1ab5c42e7e
2 changed files with 33 additions and 0 deletions
+22
View File
@@ -0,0 +1,22 @@
--- ./channel.c 2006-09-11 12:05:39.000000000 -0400
+++ ./channel.c-fixed 2006-09-11 11:58:52.000000000 -0400
@@ -45,7 +45,7 @@
#include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 38310 $")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 37361 $")
#include "asterisk/pbx.h"
#include "asterisk/frame.h"
@@ -2328,10 +2328,6 @@
int native;
int res;
- /* if already in the desired format nothing to do here */
- if (*format == fmt)
- return 0;
-
native = chan->nativeformats;
/* Find a translation path from the native format to one of the desired formats */
if (!direction)
+11
View File
@@ -0,0 +1,11 @@
--- cli-orig.c 2005-12-29 13:25:32.000000000 -0500
+++ cli.c 2005-12-29 13:03:48.000000000 -0500
@@ -428,7 +428,7 @@
{
#define FORMAT_STRING "%-20.20s %-20.20s %-7.7s %-30.30s\n"
#define FORMAT_STRING2 "%-20.20s %-20.20s %-7.7s %-30.30s\n"
-#define CONCISE_FORMAT_STRING "%s:%s:%s:%d:%s:%s:%s:%s:%s:%d:%s:%s\n"
+#define CONCISE_FORMAT_STRING "%s!%s!%s!%d!%s!%s!%s!%s!%s!%d!%s!%s\n"
#define VERBOSE_FORMAT_STRING "%-20.20s %-20.20s %-16.16s %4d %-7.7s %-12.12s %-25.25s %-15.15s %8.8s %-11.11s %-20.20s\n"
#define VERBOSE_FORMAT_STRING2 "%-20.20s %-20.20s %-16.16s %-4.4s %-7.7s %-12.12s %-25.25s %-15.15s %8.8s %-11.11s %-20.20s\n"