Merged revisions 9493,9528 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Sat, 11 Feb 2006 15:27:38 +0000 (15:27 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Sat, 11 Feb 2006 15:27:38 +0000 (15:27 +0000)
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

........

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

cdr.c

diff --git a/cdr.c b/cdr.c
index 43ec91b..898f5ae 100644 (file)
--- a/cdr.c
+++ b/cdr.c
@@ -1120,7 +1120,6 @@ static int do_reload(void)
        int was_enabled;
        int was_batchmode;
        int res=0;
-       pthread_attr_t attr;
 
        ast_mutex_lock(&cdr_batch_lock);
 
@@ -1181,7 +1180,7 @@ static int do_reload(void)
           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 {