mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 03:20:57 +00:00
Version 0.1.8 from FTP
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@263 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -58,7 +58,7 @@ static struct ast_filestream *g723_open(int fd)
|
||||
and be sure it's a valid file. */
|
||||
struct ast_filestream *tmp;
|
||||
if ((tmp = malloc(sizeof(struct ast_filestream)))) {
|
||||
if (pthread_mutex_lock(&g723_lock)) {
|
||||
if (ast_pthread_mutex_lock(&g723_lock)) {
|
||||
ast_log(LOG_WARNING, "Unable to lock g723 list\n");
|
||||
free(tmp);
|
||||
return NULL;
|
||||
@@ -78,7 +78,7 @@ static struct ast_filestream *g723_open(int fd)
|
||||
tmp->orig.tv_usec = 0;
|
||||
tmp->orig.tv_sec = 0;
|
||||
glistcnt++;
|
||||
pthread_mutex_unlock(&g723_lock);
|
||||
ast_pthread_mutex_unlock(&g723_lock);
|
||||
ast_update_use_count();
|
||||
}
|
||||
return tmp;
|
||||
@@ -91,7 +91,7 @@ static struct ast_filestream *g723_rewrite(int fd, char *comment)
|
||||
and be sure it's a valid file. */
|
||||
struct ast_filestream *tmp;
|
||||
if ((tmp = malloc(sizeof(struct ast_filestream)))) {
|
||||
if (pthread_mutex_lock(&g723_lock)) {
|
||||
if (ast_pthread_mutex_lock(&g723_lock)) {
|
||||
ast_log(LOG_WARNING, "Unable to lock g723 list\n");
|
||||
free(tmp);
|
||||
return NULL;
|
||||
@@ -105,7 +105,7 @@ static struct ast_filestream *g723_rewrite(int fd, char *comment)
|
||||
tmp->orig.tv_usec = 0;
|
||||
tmp->orig.tv_sec = 0;
|
||||
glistcnt++;
|
||||
pthread_mutex_unlock(&g723_lock);
|
||||
ast_pthread_mutex_unlock(&g723_lock);
|
||||
ast_update_use_count();
|
||||
} else
|
||||
ast_log(LOG_WARNING, "Out of memory\n");
|
||||
@@ -120,7 +120,7 @@ static struct ast_frame *g723_read(struct ast_filestream *s)
|
||||
static void g723_close(struct ast_filestream *s)
|
||||
{
|
||||
struct ast_filestream *tmp, *tmpl = NULL;
|
||||
if (pthread_mutex_lock(&g723_lock)) {
|
||||
if (ast_pthread_mutex_lock(&g723_lock)) {
|
||||
ast_log(LOG_WARNING, "Unable to lock g723 list\n");
|
||||
return;
|
||||
}
|
||||
@@ -143,7 +143,7 @@ static void g723_close(struct ast_filestream *s)
|
||||
ast_sched_del(s->owner->sched, s->owner->streamid);
|
||||
s->owner->streamid = -1;
|
||||
}
|
||||
pthread_mutex_unlock(&g723_lock);
|
||||
ast_pthread_mutex_unlock(&g723_lock);
|
||||
ast_update_use_count();
|
||||
if (!tmp)
|
||||
ast_log(LOG_WARNING, "Freeing a filestream we don't seem to own\n");
|
||||
@@ -317,7 +317,7 @@ int load_module()
|
||||
int unload_module()
|
||||
{
|
||||
struct ast_filestream *tmp, *tmpl;
|
||||
if (pthread_mutex_lock(&g723_lock)) {
|
||||
if (ast_pthread_mutex_lock(&g723_lock)) {
|
||||
ast_log(LOG_WARNING, "Unable to lock g723 list\n");
|
||||
return -1;
|
||||
}
|
||||
@@ -329,19 +329,19 @@ int unload_module()
|
||||
tmp = tmp->next;
|
||||
free(tmpl);
|
||||
}
|
||||
pthread_mutex_unlock(&g723_lock);
|
||||
ast_pthread_mutex_unlock(&g723_lock);
|
||||
return ast_format_unregister(name);
|
||||
}
|
||||
|
||||
int usecount()
|
||||
{
|
||||
int res;
|
||||
if (pthread_mutex_lock(&g723_lock)) {
|
||||
if (ast_pthread_mutex_lock(&g723_lock)) {
|
||||
ast_log(LOG_WARNING, "Unable to lock g723 list\n");
|
||||
return -1;
|
||||
}
|
||||
res = glistcnt;
|
||||
pthread_mutex_unlock(&g723_lock);
|
||||
ast_pthread_mutex_unlock(&g723_lock);
|
||||
return res;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user