Merged revisions 262800 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r262800 | pabelanger | 2010-05-12 15:59:16 -0400 (Wed, 12 May 2010) | 8 lines

  Notify CLI when modules is loaded / unloaded

  (closes issue #17308)
  Reported by: pabelanger
  Patches:
        cli.modules.patch uploaded by pabelanger (license 224)
  Tested by: pabelanger, russell
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@262802 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/cli.c b/main/cli.c
index 298d3b566db07e4ea7c4b51bddad7810c25084e4..a28baeea68d6b06eba86e7a44684c729f5124cc2 100644 (file)
--- a/main/cli.c
+++ b/main/cli.c
@@ -163,6 +163,7 @@ static char *handle_load(struct ast_cli_entry *e, int cmd, struct ast_cli_args *
                ast_cli(a->fd, "Unable to load module %s\n", a->argv[e->args]);
                return CLI_FAILURE;
        }
+       ast_cli(a->fd, "Loaded %s\n", a->argv[e->args]);
        return CLI_SUCCESS;
 }
 
@@ -424,7 +425,9 @@ static char *handle_unload(struct ast_cli_entry *e, int cmd, struct ast_cli_args
                        ast_cli(a->fd, "Unable to unload resource %s\n", a->argv[x]);
                        return CLI_FAILURE;
                }
+               ast_cli(a->fd, "Unloaded %s\n", a->argv[x]);
        }
+
        return CLI_SUCCESS;
 }
 

diff --git a/main/loader.c b/main/loader.c
index 268cc80c8f9fd404d90960da99c7043bcd73b7f4..ecd01e16c68f29059977fa68d4561a0bd14e7c32 100644 (file)
--- a/main/loader.c
+++ b/main/loader.c
@@ -489,7 +489,7 @@ int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode f
        if (!(mod = find_resource(resource_name, 0))) {
                AST_LIST_UNLOCK(&module_list);
                ast_log(LOG_WARNING, "Unload failed, '%s' could not be found\n", resource_name);
-               return 0;
+               return -1;
        }
 
        if (!(mod->flags.running || mod->flags.declined))