[asterisk-commits] trunk r9529 - in /trunk: ./ cdr.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Sat Feb 11 09:27:38 2006
New Revision: 9529

URL: http://svn.digium.com/view/asterisk?rev=9529&view=rev
Log:
Merged revisions 9493,9528 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r9493 | bweschke | 2006-02-11 00:29:34 -0600 (Sat, 11 Feb 2006) | 3 lines

 kpfleming's fix from r9472 backported to 1.2


........
r9528 | kpfleming | 2006-02-11 09:22:55 -0600 (Sat, 11 Feb 2006) | 2 lines

clean up my mess from thread-starting change

........

Modified:
    trunk/   (props changed)
    trunk/cdr.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/cdr.c
URL: http://svn.digium.com/view/asterisk/trunk/cdr.c?rev=9529&r1=9528&r2=9529&view=diff
==============================================================================
--- trunk/cdr.c (original)
+++ trunk/cdr.c Sat Feb 11 09:27:38 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 {