[asterisk-commits] kaii: branch kaii/1.8-multicall r360764 - in /team/kaii/1.8-multicall: ./ add...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Mar 29 06:15:23 CDT 2012
Author: kaii
Date: Thu Mar 29 06:15:17 2012
New Revision: 360764
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=360764
Log:
merged upstream changes from tags/1.8.10.1 into branch
Added:
team/kaii/1.8-multicall/.lastclean
- copied unchanged from r354881, tags/1.8.10.0-rc1/.lastclean
team/kaii/1.8-multicall/asterisk-1.8.10.1-summary.html
- copied unchanged from r360763, tags/1.8.10.1/asterisk-1.8.10.1-summary.html
team/kaii/1.8-multicall/asterisk-1.8.10.1-summary.txt
- copied unchanged from r360763, tags/1.8.10.1/asterisk-1.8.10.1-summary.txt
team/kaii/1.8-multicall/codecs/ilbc/FrameClassify.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/FrameClassify.c
team/kaii/1.8-multicall/codecs/ilbc/FrameClassify.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/FrameClassify.h
team/kaii/1.8-multicall/codecs/ilbc/LICENSE
- copied unchanged from r353308, branches/1.8/codecs/ilbc/LICENSE
team/kaii/1.8-multicall/codecs/ilbc/LICENSE_ADDENDUM
- copied unchanged from r353308, branches/1.8/codecs/ilbc/LICENSE_ADDENDUM
team/kaii/1.8-multicall/codecs/ilbc/LPCdecode.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/LPCdecode.c
team/kaii/1.8-multicall/codecs/ilbc/LPCdecode.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/LPCdecode.h
team/kaii/1.8-multicall/codecs/ilbc/LPCencode.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/LPCencode.c
team/kaii/1.8-multicall/codecs/ilbc/LPCencode.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/LPCencode.h
team/kaii/1.8-multicall/codecs/ilbc/PATENTS
- copied unchanged from r353308, branches/1.8/codecs/ilbc/PATENTS
team/kaii/1.8-multicall/codecs/ilbc/StateConstructW.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/StateConstructW.c
team/kaii/1.8-multicall/codecs/ilbc/StateConstructW.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/StateConstructW.h
team/kaii/1.8-multicall/codecs/ilbc/StateSearchW.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/StateSearchW.c
team/kaii/1.8-multicall/codecs/ilbc/StateSearchW.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/StateSearchW.h
team/kaii/1.8-multicall/codecs/ilbc/anaFilter.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/anaFilter.c
team/kaii/1.8-multicall/codecs/ilbc/anaFilter.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/anaFilter.h
team/kaii/1.8-multicall/codecs/ilbc/constants.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/constants.c
team/kaii/1.8-multicall/codecs/ilbc/constants.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/constants.h
team/kaii/1.8-multicall/codecs/ilbc/createCB.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/createCB.c
team/kaii/1.8-multicall/codecs/ilbc/createCB.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/createCB.h
team/kaii/1.8-multicall/codecs/ilbc/doCPLC.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/doCPLC.c
team/kaii/1.8-multicall/codecs/ilbc/doCPLC.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/doCPLC.h
team/kaii/1.8-multicall/codecs/ilbc/enhancer.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/enhancer.c
team/kaii/1.8-multicall/codecs/ilbc/enhancer.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/enhancer.h
team/kaii/1.8-multicall/codecs/ilbc/extract-cfile.awk
- copied unchanged from r353308, branches/1.8/codecs/ilbc/extract-cfile.awk
team/kaii/1.8-multicall/codecs/ilbc/filter.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/filter.c
team/kaii/1.8-multicall/codecs/ilbc/filter.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/filter.h
team/kaii/1.8-multicall/codecs/ilbc/gainquant.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/gainquant.c
team/kaii/1.8-multicall/codecs/ilbc/gainquant.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/gainquant.h
team/kaii/1.8-multicall/codecs/ilbc/getCBvec.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/getCBvec.c
team/kaii/1.8-multicall/codecs/ilbc/getCBvec.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/getCBvec.h
team/kaii/1.8-multicall/codecs/ilbc/helpfun.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/helpfun.c
team/kaii/1.8-multicall/codecs/ilbc/helpfun.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/helpfun.h
team/kaii/1.8-multicall/codecs/ilbc/hpInput.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/hpInput.c
team/kaii/1.8-multicall/codecs/ilbc/hpInput.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/hpInput.h
team/kaii/1.8-multicall/codecs/ilbc/hpOutput.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/hpOutput.c
team/kaii/1.8-multicall/codecs/ilbc/hpOutput.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/hpOutput.h
team/kaii/1.8-multicall/codecs/ilbc/iCBConstruct.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/iCBConstruct.c
team/kaii/1.8-multicall/codecs/ilbc/iCBConstruct.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/iCBConstruct.h
team/kaii/1.8-multicall/codecs/ilbc/iCBSearch.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/iCBSearch.c
team/kaii/1.8-multicall/codecs/ilbc/iCBSearch.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/iCBSearch.h
team/kaii/1.8-multicall/codecs/ilbc/iLBC_decode.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/iLBC_decode.c
team/kaii/1.8-multicall/codecs/ilbc/iLBC_decode.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/iLBC_decode.h
team/kaii/1.8-multicall/codecs/ilbc/iLBC_define.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/iLBC_define.h
team/kaii/1.8-multicall/codecs/ilbc/iLBC_encode.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/iLBC_encode.c
team/kaii/1.8-multicall/codecs/ilbc/iLBC_encode.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/iLBC_encode.h
team/kaii/1.8-multicall/codecs/ilbc/iLBC_test.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/iLBC_test.c
team/kaii/1.8-multicall/codecs/ilbc/lsf.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/lsf.c
team/kaii/1.8-multicall/codecs/ilbc/lsf.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/lsf.h
team/kaii/1.8-multicall/codecs/ilbc/packing.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/packing.c
team/kaii/1.8-multicall/codecs/ilbc/packing.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/packing.h
team/kaii/1.8-multicall/codecs/ilbc/rfc3951.txt
- copied unchanged from r353308, branches/1.8/codecs/ilbc/rfc3951.txt
team/kaii/1.8-multicall/codecs/ilbc/syntFilter.c
- copied unchanged from r353308, branches/1.8/codecs/ilbc/syntFilter.c
team/kaii/1.8-multicall/codecs/ilbc/syntFilter.h
- copied unchanged from r353308, branches/1.8/codecs/ilbc/syntFilter.h
team/kaii/1.8-multicall/contrib/realtime/mysql/sippeers.sql
- copied unchanged from r353308, branches/1.8/contrib/realtime/mysql/sippeers.sql
team/kaii/1.8-multicall/contrib/scripts/valgrind_compare
- copied unchanged from r353308, branches/1.8/contrib/scripts/valgrind_compare
team/kaii/1.8-multicall/tests/test_linkedlists.c
- copied, changed from r353308, branches/1.8/tests/test_linkedlists.c
Removed:
team/kaii/1.8-multicall/contrib/realtime/mysql/sipfriends.sql
Modified:
team/kaii/1.8-multicall/ (props changed)
team/kaii/1.8-multicall/.version
team/kaii/1.8-multicall/addons/ (props changed)
team/kaii/1.8-multicall/addons/ooh323c/src/ (props changed)
team/kaii/1.8-multicall/addons/ooh323c/src/h323/ (props changed)
team/kaii/1.8-multicall/apps/ (props changed)
team/kaii/1.8-multicall/bridges/ (props changed)
team/kaii/1.8-multicall/cdr/ (props changed)
team/kaii/1.8-multicall/cel/ (props changed)
team/kaii/1.8-multicall/cel/cel_odbc.c (props changed)
team/kaii/1.8-multicall/channels/ (props changed)
team/kaii/1.8-multicall/channels/sip/ (props changed)
team/kaii/1.8-multicall/codecs/ (props changed)
team/kaii/1.8-multicall/codecs/g722/ (props changed)
team/kaii/1.8-multicall/codecs/gsm/src/ (props changed)
team/kaii/1.8-multicall/codecs/lpc10/ (props changed)
team/kaii/1.8-multicall/configs/cel_odbc.conf.sample (props changed)
team/kaii/1.8-multicall/contrib/realtime/mysql/iaxfriends.sql (props changed)
team/kaii/1.8-multicall/contrib/realtime/mysql/meetme.sql (props changed)
team/kaii/1.8-multicall/contrib/realtime/mysql/voicemail.sql (props changed)
team/kaii/1.8-multicall/contrib/realtime/postgresql/realtime.sql (props changed)
team/kaii/1.8-multicall/formats/ (props changed)
team/kaii/1.8-multicall/funcs/ (props changed)
team/kaii/1.8-multicall/main/ (props changed)
team/kaii/1.8-multicall/main/db1-ast/btree/ (props changed)
team/kaii/1.8-multicall/main/db1-ast/db/ (props changed)
team/kaii/1.8-multicall/main/db1-ast/hash/ (props changed)
team/kaii/1.8-multicall/main/db1-ast/mpool/ (props changed)
team/kaii/1.8-multicall/main/db1-ast/recno/ (props changed)
team/kaii/1.8-multicall/main/stdtime/ (props changed)
team/kaii/1.8-multicall/pbx/ (props changed)
team/kaii/1.8-multicall/res/ (props changed)
team/kaii/1.8-multicall/res/ael/ (props changed)
team/kaii/1.8-multicall/sounds/Makefile (props changed)
team/kaii/1.8-multicall/utils/ (props changed)
Propchange: team/kaii/1.8-multicall/
------------------------------------------------------------------------------
--- branch-1.6.2-blocked (original)
+++ branch-1.6.2-blocked Thu Mar 29 06:15:17 2012
@@ -1,1 +1,1 @@
-/branches/1.6.2:279852,279883,280227,280556,280812,282668,299533,303273,309348,320506
+/branches/1.6.2:279852,279883,280227,280556,280812,282668,299533,303273,309348,320506,330490,330505
Propchange: team/kaii/1.8-multicall/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.
Propchange: team/kaii/1.8-multicall/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 29 06:15:17 2012
@@ -1,4 +1,10 @@
/be/branches/C.3:256426
-/branches/1.8:311976-325707
+/branches/1.8:311976-353308,353371,353915,353999,354495,354542,354547,355732,356475,357093,357665,359656,359706
+/tags/1.8.10.0:358208-359767
+/tags/1.8.10.0-rc1:353309-354881
+/tags/1.8.10.0-rc2:354882-357260
+/tags/1.8.10.0-rc3:357261-357716
+/tags/1.8.10.0-rc4:357717-358207
+/tags/1.8.10.1:359768-360763
/tags/1.8.5-rc1:325708-327739
/tags/1.8.5.0:327740-330824
Modified: team/kaii/1.8-multicall/.version
URL: http://svnview.digium.com/svn/asterisk/team/kaii/1.8-multicall/.version?view=diff&rev=360764&r1=360763&r2=360764
==============================================================================
--- team/kaii/1.8-multicall/.version (original)
+++ team/kaii/1.8-multicall/.version Thu Mar 29 06:15:17 2012
@@ -1,1 +1,21 @@
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
+<<<<<<< .working
1.8.5.0-multicall-k3
+=======
+1.8.10.0-rc2
+>>>>>>> .merge-right.r357260
+=======
+1.8.10.0-rc3
+>>>>>>> .merge-right.r357716
+=======
+1.8.10.0-rc4
+>>>>>>> .merge-right.r358207
+=======
+1.8.10.0
+>>>>>>> .merge-right.r359767
+=======
+1.8.10.1
+>>>>>>> .merge-right.r360763
Propchange: team/kaii/1.8-multicall/addons/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.a
*.d
*.eo
@@ -9,4 +10,3 @@
*.so
*.exports
modules.link
-
Propchange: team/kaii/1.8-multicall/addons/ooh323c/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,1 +1,2 @@
+*.o
*.i
Propchange: team/kaii/1.8-multicall/addons/ooh323c/src/h323/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,1 +1,2 @@
+*.o
*.i
Propchange: team/kaii/1.8-multicall/apps/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.a
*.d
*.eo
Propchange: team/kaii/1.8-multicall/bridges/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.a
*.d
*.eo
Propchange: team/kaii/1.8-multicall/cdr/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.a
*.d
*.eo
Propchange: team/kaii/1.8-multicall/cel/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.a
*.d
*.eo
Propchange: team/kaii/1.8-multicall/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 29 06:15:17 2012
@@ -1,4 +1,10 @@
/be/branches/C.3/cel/cel_adaptive_odbc.c:256426
/branches/1.8/cel/cel_odbc.c:311976-325707
+/tags/1.8.10.0/cel/cel_odbc.c:358208-359767
+/tags/1.8.10.0-rc1/cel/cel_odbc.c:353309-354881
+/tags/1.8.10.0-rc2/cel/cel_odbc.c:354882-357260
+/tags/1.8.10.0-rc3/cel/cel_odbc.c:357261-357716
+/tags/1.8.10.0-rc4/cel/cel_odbc.c:357717-358207
+/tags/1.8.10.1/cel/cel_odbc.c:359768-360763
/tags/1.8.5-rc1/cel/cel_odbc.c:325708-327739
/tags/1.8.5.0/cel/cel_odbc.c:327740-330824
Propchange: team/kaii/1.8-multicall/channels/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.a
*.d
*.eo
Propchange: team/kaii/1.8-multicall/channels/sip/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.i
*.gcno
*.gcda
Propchange: team/kaii/1.8-multicall/codecs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.a
*.d
*.eo
Propchange: team/kaii/1.8-multicall/codecs/g722/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.i
*.s
libg722.a
Propchange: team/kaii/1.8-multicall/codecs/gsm/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.i
*.gcno
*.gcda
Propchange: team/kaii/1.8-multicall/codecs/lpc10/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.i
*.s
*.d
Propchange: team/kaii/1.8-multicall/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 29 06:15:17 2012
@@ -1,4 +1,10 @@
/be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
/branches/1.8/configs/cel_odbc.conf.sample:311976-325707
+/tags/1.8.10.0/configs/cel_odbc.conf.sample:358208-359767
+/tags/1.8.10.0-rc1/configs/cel_odbc.conf.sample:353309-354881
+/tags/1.8.10.0-rc2/configs/cel_odbc.conf.sample:354882-357260
+/tags/1.8.10.0-rc3/configs/cel_odbc.conf.sample:357261-357716
+/tags/1.8.10.0-rc4/configs/cel_odbc.conf.sample:357717-358207
+/tags/1.8.10.1/configs/cel_odbc.conf.sample:359768-360763
/tags/1.8.5-rc1/configs/cel_odbc.conf.sample:325708-327739
/tags/1.8.5.0/configs/cel_odbc.conf.sample:327740-330824
Propchange: team/kaii/1.8-multicall/contrib/realtime/mysql/iaxfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 29 06:15:17 2012
@@ -1,3 +1,9 @@
/branches/1.8/contrib/realtime/mysql/iaxfriends.sql:311976-325707
+/tags/1.8.10.0/contrib/realtime/mysql/iaxfriends.sql:358208-359767
+/tags/1.8.10.0-rc1/contrib/realtime/mysql/iaxfriends.sql:353309-354881
+/tags/1.8.10.0-rc2/contrib/realtime/mysql/iaxfriends.sql:354882-357260
+/tags/1.8.10.0-rc3/contrib/realtime/mysql/iaxfriends.sql:357261-357716
+/tags/1.8.10.0-rc4/contrib/realtime/mysql/iaxfriends.sql:357717-358207
+/tags/1.8.10.1/contrib/realtime/mysql/iaxfriends.sql:359768-360763
/tags/1.8.5-rc1/contrib/realtime/mysql/iaxfriends.sql:325708-327739
/tags/1.8.5.0/contrib/realtime/mysql/iaxfriends.sql:327740-330824
Propchange: team/kaii/1.8-multicall/contrib/realtime/mysql/meetme.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 29 06:15:17 2012
@@ -1,3 +1,9 @@
/branches/1.8/contrib/realtime/mysql/meetme.sql:311976-325707
+/tags/1.8.10.0/contrib/realtime/mysql/meetme.sql:358208-359767
+/tags/1.8.10.0-rc1/contrib/realtime/mysql/meetme.sql:353309-354881
+/tags/1.8.10.0-rc2/contrib/realtime/mysql/meetme.sql:354882-357260
+/tags/1.8.10.0-rc3/contrib/realtime/mysql/meetme.sql:357261-357716
+/tags/1.8.10.0-rc4/contrib/realtime/mysql/meetme.sql:357717-358207
+/tags/1.8.10.1/contrib/realtime/mysql/meetme.sql:359768-360763
/tags/1.8.5-rc1/contrib/realtime/mysql/meetme.sql:325708-327739
/tags/1.8.5.0/contrib/realtime/mysql/meetme.sql:327740-330824
Propchange: team/kaii/1.8-multicall/contrib/realtime/mysql/voicemail.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 29 06:15:17 2012
@@ -1,3 +1,9 @@
/branches/1.8/contrib/realtime/mysql/voicemail.sql:311976-325707
+/tags/1.8.10.0/contrib/realtime/mysql/voicemail.sql:358208-359767
+/tags/1.8.10.0-rc1/contrib/realtime/mysql/voicemail.sql:353309-354881
+/tags/1.8.10.0-rc2/contrib/realtime/mysql/voicemail.sql:354882-357260
+/tags/1.8.10.0-rc3/contrib/realtime/mysql/voicemail.sql:357261-357716
+/tags/1.8.10.0-rc4/contrib/realtime/mysql/voicemail.sql:357717-358207
+/tags/1.8.10.1/contrib/realtime/mysql/voicemail.sql:359768-360763
/tags/1.8.5-rc1/contrib/realtime/mysql/voicemail.sql:325708-327739
/tags/1.8.5.0/contrib/realtime/mysql/voicemail.sql:327740-330824
Propchange: team/kaii/1.8-multicall/contrib/realtime/postgresql/realtime.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 29 06:15:17 2012
@@ -1,3 +1,9 @@
/branches/1.8/contrib/realtime/postgresql/realtime.sql:311976-325707
+/tags/1.8.10.0/contrib/realtime/postgresql/realtime.sql:358208-359767
+/tags/1.8.10.0-rc1/contrib/realtime/postgresql/realtime.sql:353309-354881
+/tags/1.8.10.0-rc2/contrib/realtime/postgresql/realtime.sql:354882-357260
+/tags/1.8.10.0-rc3/contrib/realtime/postgresql/realtime.sql:357261-357716
+/tags/1.8.10.0-rc4/contrib/realtime/postgresql/realtime.sql:357717-358207
+/tags/1.8.10.1/contrib/realtime/postgresql/realtime.sql:359768-360763
/tags/1.8.5-rc1/contrib/realtime/postgresql/realtime.sql:325708-327739
/tags/1.8.5.0/contrib/realtime/postgresql/realtime.sql:327740-330824
Propchange: team/kaii/1.8-multicall/formats/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.a
*.d
*.eo
Propchange: team/kaii/1.8-multicall/funcs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.a
*.d
*.eo
Propchange: team/kaii/1.8-multicall/main/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.i
*.s
*.d
Propchange: team/kaii/1.8-multicall/main/db1-ast/btree/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.i
*.gcno
*.gcda
Propchange: team/kaii/1.8-multicall/main/db1-ast/db/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.i
*.gcno
*.gcda
Propchange: team/kaii/1.8-multicall/main/db1-ast/hash/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.i
*.gcno
*.gcda
Propchange: team/kaii/1.8-multicall/main/db1-ast/mpool/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.i
*.gcno
*.gcda
Propchange: team/kaii/1.8-multicall/main/db1-ast/recno/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.i
*.gcno
*.gcda
Propchange: team/kaii/1.8-multicall/main/stdtime/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
.depend
*.a
*.so
Propchange: team/kaii/1.8-multicall/pbx/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.a
*.d
*.eo
Propchange: team/kaii/1.8-multicall/res/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.a
*.d
*.eo
Propchange: team/kaii/1.8-multicall/res/ael/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.i
*.gcno
*.gcda
Propchange: team/kaii/1.8-multicall/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 29 06:15:17 2012
@@ -1,5 +1,11 @@
/be/branches/C.3/sounds/Makefile:256426
/branches/1.8/sounds/Makefile:311976-325707
+/tags/1.8.10.0/sounds/Makefile:358208-359767
+/tags/1.8.10.0-rc1/sounds/Makefile:353309-354881
+/tags/1.8.10.0-rc2/sounds/Makefile:354882-357260
+/tags/1.8.10.0-rc3/sounds/Makefile:357261-357716
+/tags/1.8.10.0-rc4/sounds/Makefile:357717-358207
+/tags/1.8.10.1/sounds/Makefile:359768-360763
/tags/1.8.5-rc1/sounds/Makefile:325708-327739
/tags/1.8.5.0/sounds/Makefile:327740-330824
/trunk/sounds/Makefile:270974
Copied: team/kaii/1.8-multicall/tests/test_linkedlists.c (from r353308, branches/1.8/tests/test_linkedlists.c)
URL: http://svnview.digium.com/svn/asterisk/team/kaii/1.8-multicall/tests/test_linkedlists.c?view=diff&rev=360764&p1=branches/1.8/tests/test_linkedlists.c&r1=353308&p2=team/kaii/1.8-multicall/tests/test_linkedlists.c&r2=360764
==============================================================================
--- branches/1.8/tests/test_linkedlists.c (original)
+++ team/kaii/1.8-multicall/tests/test_linkedlists.c Thu Mar 29 06:15:17 2012
@@ -48,9 +48,9 @@
static struct test_val c = { "C" };
static struct test_val d = { "D" };
-AST_LIST_HEAD_NOLOCK(test_llist, test_val);
-
-static int list_expect(struct test_llist *test_list, const char *expect, struct ast_str **buf)
+AST_LIST_HEAD_NOLOCK(test_list, test_val);
+
+static int list_expect(struct test_list *test_list, char *expect, struct ast_str **buf)
{
struct test_val *i;
@@ -75,20 +75,19 @@
return AST_TEST_FAIL; \
}
-AST_TEST_DEFINE(single_ll_tests)
+AST_TEST_DEFINE(ll_tests)
{
struct ast_str *buf;
- struct test_llist test_list = { 0, };
- struct test_llist other_list = { 0, };
+ struct test_list test_list = { 0, };
struct test_val *bogus;
switch (cmd) {
case TEST_INIT:
info->name = "ll_tests";
info->category = "/main/linkedlists";
- info->summary = "single linked list unit test";
+ info->summary = "linked list unit test";
info->description =
- "Test the single linked list API";
+ "Test the linked list API";
return AST_TEST_NOT_RUN;
case TEST_EXECUTE:
break;
@@ -112,24 +111,28 @@
MATCH_OR_FAIL(&test_list, "A", buf);
AST_LIST_INSERT_HEAD(&test_list, &b, list);
MATCH_OR_FAIL(&test_list, "BA", buf);
+ AST_LIST_INSERT_HEAD(&test_list, &c, list);
+ MATCH_OR_FAIL(&test_list, "CBA", buf);
+ AST_LIST_INSERT_HEAD(&test_list, &d, list);
+ MATCH_OR_FAIL(&test_list, "DCBA", buf);
+ AST_LIST_REMOVE_HEAD(&test_list, list);
+ MATCH_OR_FAIL(&test_list, "CBA", buf);
+ AST_LIST_REMOVE_HEAD(&test_list, list);
+ MATCH_OR_FAIL(&test_list, "BA", buf);
AST_LIST_REMOVE_HEAD(&test_list, list);
MATCH_OR_FAIL(&test_list, "A", buf);
AST_LIST_REMOVE_HEAD(&test_list, list);
MATCH_OR_FAIL(&test_list, "", buf);
+
if (AST_LIST_REMOVE_HEAD(&test_list, list)) {
ast_test_status_update(test, "Somehow removed an item from the head of a list that didn't exist\n");
return AST_TEST_FAIL;
}
- MATCH_OR_FAIL(&test_list, "", buf);
-
- /* ** */
if (!AST_LIST_EMPTY(&test_list)) {
ast_test_status_update(test, "List should be empty\n");
return AST_TEST_FAIL;
}
-
- /* ** */
AST_LIST_INSERT_TAIL(&test_list, &a, list);
MATCH_OR_FAIL(&test_list, "A", buf);
@@ -139,15 +142,19 @@
MATCH_OR_FAIL(&test_list, "ABC", buf);
AST_LIST_INSERT_TAIL(&test_list, &d, list);
MATCH_OR_FAIL(&test_list, "ABCD", buf);
+
if (AST_LIST_REMOVE(&test_list, bogus, list)) {
ast_test_status_update(test, "AST_LIST_REMOVE should safely return NULL for missing element\n");
return AST_TEST_FAIL;
}
+
bogus = NULL;
+
if (AST_LIST_REMOVE(&test_list, bogus, list)) {
ast_test_status_update(test, "AST_LIST_REMOVE should safely return NULL for element set to NULL\n");
return AST_TEST_FAIL;
}
+
AST_LIST_REMOVE(&test_list, &b, list);
MATCH_OR_FAIL(&test_list, "ACD", buf);
AST_LIST_REMOVE(&test_list, &d, list);
@@ -156,29 +163,29 @@
MATCH_OR_FAIL(&test_list, "C", buf);
AST_LIST_REMOVE(&test_list, &c, list);
MATCH_OR_FAIL(&test_list, "", buf);
+
if (!AST_LIST_EMPTY(&test_list)) {
ast_test_status_update(test, "List should be empty\n");
return AST_TEST_FAIL;
}
+
if (AST_LIST_REMOVE(&test_list, bogus, list)) {
ast_test_status_update(test, "AST_LIST_REMOVE should safely return NULL asked to remove a NULL pointer from an empty list\n");
return AST_TEST_FAIL;
}
- /* ** */
-
AST_LIST_INSERT_HEAD(&test_list, &a, list);
MATCH_OR_FAIL(&test_list, "A", buf);
- AST_LIST_INSERT_TAIL(&test_list, &c, list);
- MATCH_OR_FAIL(&test_list, "AC", buf);
- AST_LIST_INSERT_AFTER(&test_list, &a, &b, list);
- MATCH_OR_FAIL(&test_list, "ABC", buf);
- AST_LIST_INSERT_AFTER(&test_list, &c, &d, list);
- MATCH_OR_FAIL(&test_list, "ABCD", buf);
+ AST_LIST_INSERT_TAIL(&test_list, &b, list);
+ MATCH_OR_FAIL(&test_list, "AB", buf);
+ AST_LIST_INSERT_AFTER(&test_list, &a, &c, list);
+ MATCH_OR_FAIL(&test_list, "ACB", buf);
+ AST_LIST_INSERT_AFTER(&test_list, &b, &d, list);
+ MATCH_OR_FAIL(&test_list, "ACBD", buf);
ELEM_OR_FAIL(AST_LIST_FIRST(&test_list), &a);
ELEM_OR_FAIL(AST_LIST_LAST(&test_list), &d);
- ELEM_OR_FAIL(AST_LIST_NEXT(&a, list), &b);
+ ELEM_OR_FAIL(AST_LIST_NEXT(&a, list), &c);
AST_LIST_TRAVERSE_SAFE_BEGIN(&test_list, bogus, list) {
AST_LIST_REMOVE_CURRENT(list);
@@ -190,111 +197,18 @@
return AST_TEST_FAIL;
}
- /* ** */
-
- AST_LIST_INSERT_HEAD(&test_list, &a, list);
- MATCH_OR_FAIL(&test_list, "A", buf);
- AST_LIST_INSERT_TAIL(&test_list, &b, list);
- MATCH_OR_FAIL(&test_list, "AB", buf);
- AST_LIST_INSERT_HEAD(&other_list, &c, list);
- MATCH_OR_FAIL(&other_list, "C", buf);
- AST_LIST_INSERT_TAIL(&other_list, &d, list);
- MATCH_OR_FAIL(&other_list, "CD", buf);
- AST_LIST_APPEND_LIST(&test_list, &other_list, list);
- MATCH_OR_FAIL(&test_list, "ABCD", buf);
- MATCH_OR_FAIL(&other_list, "", buf);
- AST_LIST_TRAVERSE_SAFE_BEGIN(&test_list, bogus, list) {
- AST_LIST_REMOVE_CURRENT(list);
- }
- AST_LIST_TRAVERSE_SAFE_END;
- if (!AST_LIST_EMPTY(&test_list)) {
- ast_test_status_update(test, "List should be empty after traversing and removal. It wasn't.\n");
- return AST_TEST_FAIL;
- }
-
- /* ** */
-
- AST_LIST_INSERT_HEAD(&test_list, &a, list);
- MATCH_OR_FAIL(&test_list, "A", buf);
- AST_LIST_INSERT_TAIL(&test_list, &d, list);
- MATCH_OR_FAIL(&test_list, "AD", buf);
- AST_LIST_INSERT_HEAD(&other_list, &b, list);
- MATCH_OR_FAIL(&other_list, "B", buf);
- AST_LIST_INSERT_TAIL(&other_list, &c, list);
- MATCH_OR_FAIL(&other_list, "BC", buf);
- AST_LIST_INSERT_LIST_AFTER(&test_list, &other_list, &a, list);
- MATCH_OR_FAIL(&test_list, "ABCD", buf);
- MATCH_OR_FAIL(&other_list, "", buf);
- AST_LIST_TRAVERSE_SAFE_BEGIN(&test_list, bogus, list) {
- AST_LIST_REMOVE_CURRENT(list);
- }
- AST_LIST_TRAVERSE_SAFE_END;
- if (!AST_LIST_EMPTY(&test_list)) {
- ast_test_status_update(test, "List should be empty after traversing and removal. It wasn't.\n");
- return AST_TEST_FAIL;
- }
-
- /* ** */
-
- AST_LIST_INSERT_HEAD(&test_list, &a, list);
- MATCH_OR_FAIL(&test_list, "A", buf);
- AST_LIST_INSERT_TAIL(&test_list, &b, list);
- MATCH_OR_FAIL(&test_list, "AB", buf);
- AST_LIST_INSERT_HEAD(&other_list, &c, list);
- MATCH_OR_FAIL(&other_list, "C", buf);
- AST_LIST_INSERT_TAIL(&other_list, &d, list);
- MATCH_OR_FAIL(&other_list, "CD", buf);
- AST_LIST_INSERT_LIST_AFTER(&test_list, &other_list, &b, list);
- MATCH_OR_FAIL(&test_list, "ABCD", buf);
- MATCH_OR_FAIL(&other_list, "", buf);
- AST_LIST_TRAVERSE_SAFE_BEGIN(&test_list, bogus, list) {
- AST_LIST_REMOVE_CURRENT(list);
- }
- AST_LIST_TRAVERSE_SAFE_END;
- if (!AST_LIST_EMPTY(&test_list)) {
- ast_test_status_update(test, "List should be empty after traversing and removal. It wasn't.\n");
- return AST_TEST_FAIL;
- }
-
- /* ** */
-
- AST_LIST_INSERT_HEAD(&test_list, &a, list);
- MATCH_OR_FAIL(&test_list, "A", buf);
- AST_LIST_INSERT_TAIL(&test_list, &d, list);
- MATCH_OR_FAIL(&test_list, "AD", buf);
- AST_LIST_TRAVERSE_SAFE_BEGIN(&test_list, bogus, list) {
- if (bogus == &d) {
- AST_LIST_INSERT_BEFORE_CURRENT(&b, list);
- MATCH_OR_FAIL(&test_list, "ABD", buf);
- AST_LIST_INSERT_BEFORE_CURRENT(&c, list);
- MATCH_OR_FAIL(&test_list, "ABCD", buf);
- AST_LIST_REMOVE_CURRENT(list);
- MATCH_OR_FAIL(&test_list, "ABC", buf);
- }
- }
- AST_LIST_TRAVERSE_SAFE_END;
- MATCH_OR_FAIL(&test_list, "ABC", buf);
- AST_LIST_TRAVERSE_SAFE_BEGIN(&test_list, bogus, list) {
- AST_LIST_REMOVE_CURRENT(list);
- }
- AST_LIST_TRAVERSE_SAFE_END;
- if (!AST_LIST_EMPTY(&test_list)) {
- ast_test_status_update(test, "List should be empty after traversing and removal. It wasn't.\n");
- return AST_TEST_FAIL;
- }
-
return AST_TEST_PASS;
}
static int unload_module(void)
{
- AST_TEST_UNREGISTER(single_ll_tests);
+ AST_TEST_UNREGISTER(ll_tests);
return 0;
}
static int load_module(void)
{
- AST_TEST_REGISTER(single_ll_tests);
+ AST_TEST_REGISTER(ll_tests);
return AST_MODULE_LOAD_SUCCESS;
}
Propchange: team/kaii/1.8-multicall/utils/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 29 06:15:17 2012
@@ -1,3 +1,4 @@
+*.o
*.d
*.i
*.s
More information about the asterisk-commits
mailing list