diff options
| author | Kinsey Moore <kmoore@digium.com> | 2012-05-10 20:56:09 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2012-05-10 20:56:09 +0000 |
| commit | dd81b047dbf15a501b81354db505daf50703a1a0 (patch) | |
| tree | 01754d4206c865653717baf23e47ed264f7a6b3d /main/manager.c | |
| parent | 8227f70cd70f497cb03c1f9aab63950bcd979d8b (diff) | |
Resolve FORWARD_NULL static analysis warnings
This resolves core findings from ASTERISK-19650 numbers 0-2, 6, 7, 9-11, 14-20,
22-24, 28, 30-32, 34-36, 42-56, 82-84, 87, 89-90, 93-102, 104, 105, 109-111,
and 115. Finding numbers 26, 33, and 29 were already resolved. Those skipped
were either extended/deprecated or in areas of code that shouldn't be
disturbed.
(Closes issue ASTERISK-19650)
........
Merged revisions 366167 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 366168 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@366169 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/manager.c')
| -rw-r--r-- | main/manager.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/main/manager.c b/main/manager.c index 2a4bfa0c1..7a1c9a83b 100644 --- a/main/manager.c +++ b/main/manager.c @@ -4690,10 +4690,22 @@ static int action_reload(struct mansession *s, const struct message *m) const char *module = astman_get_header(m, "Module"); int res = ast_module_reload(S_OR(module, NULL)); - if (res == 2) { + switch (res) { + case -1: + astman_send_error(s, m, "A reload is in progress"); + break; + case 0: + astman_send_error(s, m, "No such module"); + break; + case 1: + astman_send_error(s, m, "Module does not support reload"); + break; + case 2: astman_send_ack(s, m, "Module Reloaded"); - } else { - astman_send_error(s, m, s == 0 ? "No such module" : "Module does not support reload"); + break; + default: + astman_send_error(s, m, "An unknown error occurred"); + break; } return 0; } @@ -7054,7 +7066,7 @@ static int __init_manager(int reload) if (user_writetimeout) { int value = atoi(user_writetimeout); if (value < 100) { - ast_log(LOG_WARNING, "Invalid writetimeout value '%s' at users.conf line %d\n", var->value, var->lineno); + ast_log(LOG_WARNING, "Invalid writetimeout value '%d' in users.conf\n", value); } else { user->writetimeout = value; } |