[asterisk-commits] kmoore: branch kmoore/stasis-channel_events-take2 r384605 - in /team/kmoore/s...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Tue Apr  2 17:08:46 2013
New Revision: 384605

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=384605
Log:
Addressed review feedback: s/stasis_app/app/
........

Merged revisions 384587 from http://svn.asterisk.org/svn/asterisk/team/dlee/stasis-app

Modified:
    team/kmoore/stasis-channel_events-take2/   (props changed)
    team/kmoore/stasis-channel_events-take2/apps/app_stasis.c

Propchange: team/kmoore/stasis-channel_events-take2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr  2 17:08:46 2013
@@ -1,1 +1,1 @@
-/team/dlee/stasis-app:1-384510
+/team/dlee/stasis-app:1-384604

Modified: team/kmoore/stasis-channel_events-take2/apps/app_stasis.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-channel_events-take2/apps/app_stasis.c?view=diff&rev=384605&r1=384604&r2=384605
==============================================================================
--- team/kmoore/stasis-channel_events-take2/apps/app_stasis.c (original)
+++ team/kmoore/stasis-channel_events-take2/apps/app_stasis.c Tue Apr  2 17:08:46 2013
@@ -161,7 +161,7 @@
 	return app;
 }
 
-/*! AO2 hash function for \ref stasis_app */
+/*! AO2 hash function for \ref app */
 static int app_hash(const void *obj, const int flags)
 {
 	const struct app *app = obj;
@@ -170,7 +170,7 @@
 	return ast_str_hash(name);
 }
 
-/*! AO2 comparison function for \ref stasis_app */
+/*! AO2 comparison function for \ref app */
 static int app_compare(void *lhs, void *rhs, int flags)
 {
 	const struct app *lhs_app = lhs;
@@ -772,7 +772,6 @@
 		if (app) {
 			ao2_link_flags(apps, app, OBJ_NOLOCK);
 		} else {
-			ast_log(LOG_ERROR, "Failed to allocate stasis_app\n");
 			return -1;
 		}
 	}