From 18dbcd321d827423dc0ad1b8b8113bb9eb2f41c2 Mon Sep 17 00:00:00 2001 From: Automerge script Date: Sat, 11 Feb 2006 16:03:16 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@9547 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- cdr.c | 3 +-- channels/chan_sip.c | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cdr.c b/cdr.c index 442de9c1fd..edad68e48d 100644 --- a/cdr.c +++ b/cdr.c @@ -1136,7 +1136,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); @@ -1197,7 +1196,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 { diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 493a3e93b4..74b889b9e0 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -11434,7 +11434,6 @@ restartsearch: /*! \brief restart_monitor: Start the channel monitor thread ---*/ static int restart_monitor(void) { - pthread_attr_t attr; /* If we're supposed to be stopped -- stay stopped */ if (monitor_thread == AST_PTHREADT_STOP) return 0;