mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
Merged revisions 7848 via svnmerge from
/branches/1.2 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7849 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -288,10 +288,11 @@ static void launch_service(struct outgoing *o)
|
||||
{
|
||||
pthread_t t;
|
||||
pthread_attr_t attr;
|
||||
int ret;
|
||||
pthread_attr_init(&attr);
|
||||
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
|
||||
if (ast_pthread_create(&t,&attr,attempt_thread, o) == -1) {
|
||||
ast_log(LOG_WARNING, "Unable to create thread :(\n");
|
||||
if ((ret = ast_pthread_create(&t,&attr,attempt_thread, o)) != 0) {
|
||||
ast_log(LOG_WARNING, "Unable to create thread :( (returned error: %d)\n", ret);
|
||||
free_outgoing(o);
|
||||
}
|
||||
}
|
||||
@@ -412,6 +413,7 @@ int load_module(void)
|
||||
{
|
||||
pthread_t thread;
|
||||
pthread_attr_t attr;
|
||||
int ret;
|
||||
snprintf(qdir, sizeof(qdir), "%s/%s", ast_config_AST_SPOOL_DIR, "outgoing");
|
||||
if (mkdir(qdir, 0700) && (errno != EEXIST)) {
|
||||
ast_log(LOG_WARNING, "Unable to create queue directory %s -- outgoing spool disabled\n", qdir);
|
||||
@@ -419,8 +421,8 @@ int load_module(void)
|
||||
}
|
||||
pthread_attr_init(&attr);
|
||||
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
|
||||
if (ast_pthread_create(&thread,&attr,scan_thread, NULL) == -1) {
|
||||
ast_log(LOG_WARNING, "Unable to create thread :(\n");
|
||||
if ((ret = ast_pthread_create(&thread,&attr,scan_thread, NULL)) != 0) {
|
||||
ast_log(LOG_WARNING, "Unable to create thread :( (returned error: %d)\n", ret);
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user