diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-09 18:24:45 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-09 18:24:45 +0000 |
| commit | 3e7b349d015bc6ca8d301da04f706ce748c80857 (patch) | |
| tree | e10173dade84321a5d65133e74ae67dc40f9a29f | |
| parent | 5bcc97fce3517163dc95e9b042840dd60190aeef (diff) | |
Merged revisions 275186 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r275186 | mnicholson | 2010-07-09 13:24:03 -0500 (Fri, 09 Jul 2010) | 9 lines
Merged revisions 275182 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r275182 | mnicholson | 2010-07-09 13:23:23 -0500 (Fri, 09 Jul 2010) | 2 lines
give a better error message when attempting to unload a module that is not loaded
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@275191 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/loader.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/loader.c b/main/loader.c index d2a283f14..f5b737d84 100644 --- a/main/loader.c +++ b/main/loader.c @@ -494,8 +494,10 @@ int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode f return -1; } - if (!mod->flags.running || mod->flags.declined) + if (!mod->flags.running || mod->flags.declined) { + ast_log(LOG_WARNING, "Unload failed, '%s' is not loaded.\n", resource_name); error = 1; + } if (!error && (mod->usecount > 0)) { if (force) |