summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorOlle Johansson <oej@edvina.net>2006-03-14 07:09:57 +0000
committerOlle Johansson <oej@edvina.net>2006-03-14 07:09:57 +0000
commitb4a0e2a8bbabdd371ec5f8367ca45b23bdbc5dec (patch)
treeaab34afda416d3e4d78c441185cc8f2e941a594b /res
parentfcc0ca86275cc5d9de702fb92b88806e65b2ef0f (diff)
- Formatting fix in musiconhold
- One extra doxygen comment in res_features git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@12842 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r--res/res_features.c1
-rw-r--r--res/res_musiconhold.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/res/res_features.c b/res/res_features.c
index ed90aef2c..dab637655 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -1451,6 +1451,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
return res;
}
+/*! \brief Take care of parked calls and unpark them if needed */
static void *do_parking_thread(void *ignore)
{
int ms, tms, max;
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 9b61264bb..bca584db0 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -950,7 +950,7 @@ static int load_moh_classes(int reload)
class->format = AST_FORMAT_SLINEAR;
}
}
- var = var->next;
+ var = var->next;
}
if (ast_strlen_zero(class->dir)) {