[svn-commits] branch kpfleming/chanfunc r9550 - in
/team/kpfleming/chanfunc: ./ apps/ build...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Sat Feb 11 09:20:23 MST 2006
Author: kpfleming
Date: Sat Feb 11 10:20:20 2006
New Revision: 9550
URL: http://svn.digium.com/view/asterisk?rev=9550&view=rev
Log:
update and re-enable automerge
Modified:
team/kpfleming/chanfunc/ (props changed)
team/kpfleming/chanfunc/apps/app_morsecode.c (contents, props changed)
team/kpfleming/chanfunc/apps/app_setcallerid.c (contents, props changed)
team/kpfleming/chanfunc/build_tools/make_svn_branch_name (props changed)
team/kpfleming/chanfunc/cdr.c
team/kpfleming/chanfunc/channels/misdn/fac.c (props changed)
team/kpfleming/chanfunc/channels/misdn/fac.h (props changed)
team/kpfleming/chanfunc/configs/func_odbc.conf.sample (props changed)
team/kpfleming/chanfunc/configs/smdi.conf.sample (props changed)
team/kpfleming/chanfunc/configs/udptl.conf.sample (props changed)
team/kpfleming/chanfunc/contrib/scripts/safe_asterisk_restart (props changed)
team/kpfleming/chanfunc/doc/00README.1st (props changed)
team/kpfleming/chanfunc/doc/callingpres.txt (props changed)
team/kpfleming/chanfunc/doc/smdi.txt (props changed)
team/kpfleming/chanfunc/formats/format_h264.c (contents, props changed)
team/kpfleming/chanfunc/funcs/func_base64.c
team/kpfleming/chanfunc/funcs/func_env.c
team/kpfleming/chanfunc/funcs/func_odbc.c (contents, props changed)
team/kpfleming/chanfunc/funcs/func_rand.c (contents, props changed)
team/kpfleming/chanfunc/include/asterisk/sha1.h (props changed)
team/kpfleming/chanfunc/include/asterisk/smdi.h (props changed)
team/kpfleming/chanfunc/include/asterisk/stringfields.h (props changed)
team/kpfleming/chanfunc/include/asterisk/udptl.h (props changed)
team/kpfleming/chanfunc/res/res_clioriginate.c (contents, props changed)
team/kpfleming/chanfunc/res/res_smdi.c (contents, props changed)
team/kpfleming/chanfunc/sha1.c (props changed)
team/kpfleming/chanfunc/udptl.c (contents, props changed)
Propchange: team/kpfleming/chanfunc/
------------------------------------------------------------------------------
automerge = *
Propchange: team/kpfleming/chanfunc/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/kpfleming/chanfunc/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/kpfleming/chanfunc/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Feb 11 10:20:20 2006
@@ -1,1 +1,1 @@
-/trunk:1-9510
+/trunk:1-9549
Modified: team/kpfleming/chanfunc/apps/app_morsecode.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/chanfunc/apps/app_morsecode.c?rev=9550&r1=9549&r2=9550&view=diff
==============================================================================
--- team/kpfleming/chanfunc/apps/app_morsecode.c (original)
+++ team/kpfleming/chanfunc/apps/app_morsecode.c Sat Feb 11 10:20:20 2006
@@ -31,7 +31,7 @@
#include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 7221 $")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/file.h"
#include "asterisk/logger.h"
Propchange: team/kpfleming/chanfunc/apps/app_morsecode.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/apps/app_morsecode.c
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Modified: team/kpfleming/chanfunc/apps/app_setcallerid.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/chanfunc/apps/app_setcallerid.c?rev=9550&r1=9549&r2=9550&view=diff
==============================================================================
--- team/kpfleming/chanfunc/apps/app_setcallerid.c (original)
+++ team/kpfleming/chanfunc/apps/app_setcallerid.c Sat Feb 11 10:20:20 2006
@@ -31,7 +31,7 @@
#include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 7221 $")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/lock.h"
#include "asterisk/file.h"
Propchange: team/kpfleming/chanfunc/apps/app_setcallerid.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/apps/app_setcallerid.c
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Propchange: team/kpfleming/chanfunc/build_tools/make_svn_branch_name
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/build_tools/make_svn_branch_name
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Modified: team/kpfleming/chanfunc/cdr.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/chanfunc/cdr.c?rev=9550&r1=9549&r2=9550&view=diff
==============================================================================
--- team/kpfleming/chanfunc/cdr.c (original)
+++ team/kpfleming/chanfunc/cdr.c Sat Feb 11 10:20:20 2006
@@ -1120,7 +1120,6 @@
int was_enabled;
int was_batchmode;
int res=0;
- pthread_attr_t attr;
ast_mutex_lock(&cdr_batch_lock);
@@ -1181,7 +1180,7 @@
if it does not exist */
if (enabled && batchmode && (!was_enabled || !was_batchmode) && (cdr_thread == AST_PTHREADT_NULL)) {
ast_cond_init(&cdr_pending_cond, NULL);
- if (ast_pthread_create(&cdr_thread, &attr, do_cdr, NULL) < 0) {
+ if (ast_pthread_create(&cdr_thread, NULL, do_cdr, NULL) < 0) {
ast_log(LOG_ERROR, "Unable to start CDR thread.\n");
ast_sched_del(sched, cdr_sched);
} else {
Propchange: team/kpfleming/chanfunc/channels/misdn/fac.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/channels/misdn/fac.c
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Propchange: team/kpfleming/chanfunc/channels/misdn/fac.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/channels/misdn/fac.h
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Propchange: team/kpfleming/chanfunc/configs/func_odbc.conf.sample
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/configs/func_odbc.conf.sample
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Propchange: team/kpfleming/chanfunc/configs/smdi.conf.sample
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/configs/smdi.conf.sample
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Propchange: team/kpfleming/chanfunc/configs/udptl.conf.sample
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/configs/udptl.conf.sample
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Propchange: team/kpfleming/chanfunc/contrib/scripts/safe_asterisk_restart
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/contrib/scripts/safe_asterisk_restart
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Propchange: team/kpfleming/chanfunc/doc/00README.1st
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/doc/00README.1st
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Propchange: team/kpfleming/chanfunc/doc/callingpres.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/doc/callingpres.txt
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Propchange: team/kpfleming/chanfunc/doc/smdi.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/doc/smdi.txt
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Modified: team/kpfleming/chanfunc/formats/format_h264.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/chanfunc/formats/format_h264.c?rev=9550&r1=9549&r2=9550&view=diff
==============================================================================
--- team/kpfleming/chanfunc/formats/format_h264.c (original)
+++ team/kpfleming/chanfunc/formats/format_h264.c Sat Feb 11 10:20:20 2006
@@ -34,7 +34,7 @@
#include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 7221 $")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/lock.h"
#include "asterisk/channel.h"
Propchange: team/kpfleming/chanfunc/formats/format_h264.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/formats/format_h264.c
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Modified: team/kpfleming/chanfunc/funcs/func_base64.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/chanfunc/funcs/func_base64.c?rev=9550&r1=9549&r2=9550&view=diff
==============================================================================
--- team/kpfleming/chanfunc/funcs/func_base64.c (original)
+++ team/kpfleming/chanfunc/funcs/func_base64.c Sat Feb 11 10:20:20 2006
@@ -46,7 +46,7 @@
}
ast_log(LOG_DEBUG, "data=%s\n",data);
- res = ast_base64encode(buf, data, strlen(data), len);
+ res = ast_base64encode(buf, (unsigned char *)data, strlen(data), len);
ast_log(LOG_DEBUG, "res=%d\n", res);
return buf;
}
@@ -59,7 +59,7 @@
}
ast_log(LOG_DEBUG, "data=%s\n", data);
- ast_base64decode(buf, data, len);
+ ast_base64decode((unsigned char *)buf, data, len);
return buf;
}
Modified: team/kpfleming/chanfunc/funcs/func_env.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/chanfunc/funcs/func_env.c?rev=9550&r1=9549&r2=9550&view=diff
==============================================================================
--- team/kpfleming/chanfunc/funcs/func_env.c (original)
+++ team/kpfleming/chanfunc/funcs/func_env.c Sat Feb 11 10:20:20 2006
@@ -20,6 +20,7 @@
*
*/
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
Modified: team/kpfleming/chanfunc/funcs/func_odbc.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/chanfunc/funcs/func_odbc.c?rev=9550&r1=9549&r2=9550&view=diff
==============================================================================
--- team/kpfleming/chanfunc/funcs/func_odbc.c (original)
+++ team/kpfleming/chanfunc/funcs/func_odbc.c Sat Feb 11 10:20:20 2006
@@ -32,7 +32,7 @@
#include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 7682 $")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/module.h"
#include "asterisk/file.h"
Propchange: team/kpfleming/chanfunc/funcs/func_odbc.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/funcs/func_odbc.c
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Modified: team/kpfleming/chanfunc/funcs/func_rand.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/chanfunc/funcs/func_rand.c?rev=9550&r1=9549&r2=9550&view=diff
==============================================================================
--- team/kpfleming/chanfunc/funcs/func_rand.c (original)
+++ team/kpfleming/chanfunc/funcs/func_rand.c Sat Feb 11 10:20:20 2006
@@ -30,7 +30,7 @@
#include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 7682 $")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/module.h"
#include "asterisk/channel.h"
Propchange: team/kpfleming/chanfunc/funcs/func_rand.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/funcs/func_rand.c
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Propchange: team/kpfleming/chanfunc/include/asterisk/sha1.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/include/asterisk/sha1.h
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Propchange: team/kpfleming/chanfunc/include/asterisk/smdi.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/include/asterisk/smdi.h
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Propchange: team/kpfleming/chanfunc/include/asterisk/stringfields.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/include/asterisk/stringfields.h
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Propchange: team/kpfleming/chanfunc/include/asterisk/udptl.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/include/asterisk/udptl.h
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Modified: team/kpfleming/chanfunc/res/res_clioriginate.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/chanfunc/res/res_clioriginate.c?rev=9550&r1=9549&r2=9550&view=diff
==============================================================================
--- team/kpfleming/chanfunc/res/res_clioriginate.c (original)
+++ team/kpfleming/chanfunc/res/res_clioriginate.c Sat Feb 11 10:20:20 2006
@@ -29,7 +29,7 @@
#include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.1 $");
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
Propchange: team/kpfleming/chanfunc/res/res_clioriginate.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/res/res_clioriginate.c
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Modified: team/kpfleming/chanfunc/res/res_smdi.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/chanfunc/res/res_smdi.c?rev=9550&r1=9549&r2=9550&view=diff
==============================================================================
--- team/kpfleming/chanfunc/res/res_smdi.c (original)
+++ team/kpfleming/chanfunc/res/res_smdi.c Sat Feb 11 10:20:20 2006
@@ -32,7 +32,7 @@
#include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: $")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/module.h"
#include "asterisk/lock.h"
Propchange: team/kpfleming/chanfunc/res/res_smdi.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/res/res_smdi.c
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Propchange: team/kpfleming/chanfunc/sha1.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/sha1.c
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
Modified: team/kpfleming/chanfunc/udptl.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/chanfunc/udptl.c?rev=9550&r1=9549&r2=9550&view=diff
==============================================================================
--- team/kpfleming/chanfunc/udptl.c (original)
+++ team/kpfleming/chanfunc/udptl.c Sat Feb 11 10:20:20 2006
@@ -29,7 +29,7 @@
#include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 8038 $")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/udptl.h"
#include "asterisk/frame.h"
Propchange: team/kpfleming/chanfunc/udptl.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/kpfleming/chanfunc/udptl.c
------------------------------------------------------------------------------
svn:keywords = Author Revision Id Date
More information about the svn-commits
mailing list