[svn-commits] pabelanger: branch 1.6.0 r262803 - in /branches/1.6.0: ./ main/

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Wed May 12 15:03:58 2010
New Revision: 262803

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=262803
Log:
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
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/cli.c
    branches/1.6.0/main/loader.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/cli.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/cli.c?view=diff&rev=262803&r1=262802&r2=262803
==============================================================================
--- branches/1.6.0/main/cli.c (original)
+++ branches/1.6.0/main/cli.c Wed May 12 15:03:58 2010
@@ -163,6 +163,7 @@
 		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 @@
 			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;
 }
 

Modified: branches/1.6.0/main/loader.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/loader.c?view=diff&rev=262803&r1=262802&r2=262803
==============================================================================
--- branches/1.6.0/main/loader.c (original)
+++ branches/1.6.0/main/loader.c Wed May 12 15:03:58 2010
@@ -508,7 +508,7 @@
 	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))