Version 0.1.9 from FTP

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_echo.c b/apps/app_echo.c
index db1eb9e9a5546461bae899c5064c51251e3b135e..669018ec26c8b54c272e663b86ce3e0dd64469a0 100755 (executable)
--- a/apps/app_echo.c
+++ b/apps/app_echo.c
@@ -31,8 +31,8 @@ static char *app = "Echo";
 static char *synopsis = "Echo audio read back to the user";
 
 static char *descrip = 
-"  Echo():  Echo audio read from channel back to the channel.  Returns 0\n"
-"  if the user exits with the '#' key, or -1 if the user hangs up.\n";
+"  Echo():  Echo audio read from channel back to the channel. Returns 0\n"
+"if the user exits with the '#' key, or -1 if the user hangs up.\n";
 
 STANDARD_LOCAL_USER;
 
@@ -57,6 +57,7 @@ static int echo_exec(struct ast_channel *chan, void *data)
                                if (ast_write(chan, f))
                                        break;
                }
+               ast_frfree(f);
        }
        LOCAL_USER_REMOVE(u);
        return res;

diff --git a/sched.c b/sched.c
index a4fb1096ae947365ec10770a636b044c2474eb9c..b9b44f8697fcb56c9f9d35a4b8cd64c06fa8825c 100755 (executable)
--- a/sched.c
+++ b/sched.c
@@ -23,6 +23,7 @@
 #include <unistd.h>
 #include <asterisk/sched.h>
 #include <asterisk/logger.h>
+#include <asterisk/channel.h>
 
 /* Determine if a is sooner than b */
 #define SOONER(a,b) (((b).tv_sec > (a).tv_sec) || \
@@ -243,8 +244,8 @@ int ast_sched_del(struct sched_context *con, int id)
                s = s->next;
        }
        ast_log(LOG_NOTICE, "Attempted to delete non-existant schedule entry %d!\n", id);
-#ifdef FORCE_CRASH
-       crash();
+#ifdef DO_CRASH
+       CRASH;
 #endif
        return -1;
 }