diff options
| author | Russell Bryant <russell@russellbryant.com> | 2011-05-03 20:45:32 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2011-05-03 20:45:32 +0000 |
| commit | 37aa52fd78996b5c516ff4c851b60252eda84b05 (patch) | |
| tree | e1651180838e594a0203f863f3cdd084860e1bf5 /main/channel.c | |
| parent | 810b9c887949fc4bd9f01dcdc0d3a4f476cb00de (diff) | |
Merged revisions 316265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r316265 | russell | 2011-05-03 14:55:49 -0500 (Tue, 03 May 2011) | 5 lines
Fix a bunch of compiler warnings generated by gcc 4.6.0.
Most of these are -Wunused-but-set-variable, but there were a few others
mixed in here, as well.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316293 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/main/channel.c b/main/channel.c index 55695c54c..2b90ef494 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2531,7 +2531,7 @@ struct ast_datastore *ast_channel_datastore_find(struct ast_channel *chan, const if (info == NULL) return NULL; - AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->datastores, datastore, entry) { + AST_LIST_TRAVERSE(&chan->datastores, datastore, entry) { if (datastore->info != info) { continue; } @@ -2546,7 +2546,6 @@ struct ast_datastore *ast_channel_datastore_find(struct ast_channel *chan, const break; } } - AST_LIST_TRAVERSE_SAFE_END; return datastore; } |