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 /res/res_fax.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 'res/res_fax.c')
| -rw-r--r-- | res/res_fax.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/res/res_fax.c b/res/res_fax.c index ed718aeb6..4126cef5c 100644 --- a/res/res_fax.c +++ b/res/res_fax.c @@ -2266,9 +2266,7 @@ static char *fax_session_tab_complete(struct ast_cli_args *a) } ao2_ref(s, -1); } - if (ao2_iterator_destroy != NULL) { - ao2_iterator_destroy(&i); - } + ao2_iterator_destroy(&i); return name; } @@ -2502,9 +2500,7 @@ static char *cli_fax_show_sessions(struct ast_cli_entry *e, int cmd, struct ast_ ast_log(LOG_ERROR, "error printing filenames for 'fax show sessions' command"); ao2_unlock(s); ao2_ref(s, -1); - if (ao2_iterator_destroy != NULL) { - ao2_iterator_destroy(&i); - } + ao2_iterator_destroy(&i); return CLI_FAILURE; } @@ -2518,9 +2514,7 @@ static char *cli_fax_show_sessions(struct ast_cli_entry *e, int cmd, struct ast_ ao2_unlock(s); ao2_ref(s, -1); } - if (ao2_iterator_destroy != NULL) { - ao2_iterator_destroy(&i); - } + ao2_iterator_destroy(&i); session_count = ao2_container_count(faxregistry.container); ast_cli(a->fd, "\n%d FAX sessions\n\n", session_count); |