[svn-commits] kmoore: branch kmoore/stasis-device_state r383041 - in /team/kmoore/stasis-de...

[SVN commits to the Digium repositories]

Author: kmoore
Date: Wed Mar 13 14:58:05 2013
New Revision: 383041

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=383041
Log:
More cleanup

Modified:
    team/kmoore/stasis-device_state/main/devicestate.c
    team/kmoore/stasis-device_state/res/res_xmpp.c

Modified: team/kmoore/stasis-device_state/main/devicestate.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-device_state/main/devicestate.c?view=diff&rev=383041&r1=383040&r2=383041
==============================================================================
--- team/kmoore/stasis-device_state/main/devicestate.c (original)
+++ team/kmoore/stasis-device_state/main/devicestate.c Wed Mar 13 14:58:05 2013
@@ -644,7 +644,7 @@
 		agg_state = get_agg_state(device);
 		ast_debug(1, "Aggregate devstate result is '%s' for '%s'\n",
 			ast_devstate2str(agg_state), device);
-	
+
 		cached_agg_msg = stasis_cache_get(stasis_device_state_topic_cached(), stasis_device_state(), device);
 		if (cached_agg_msg) {
 			struct stasis_device_state *cached_agg_dev_state = stasis_message_data(cached_agg_msg);

Modified: team/kmoore/stasis-device_state/res/res_xmpp.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-device_state/res/res_xmpp.c?view=diff&rev=383041&r1=383040&r2=383041
==============================================================================
--- team/kmoore/stasis-device_state/res/res_xmpp.c (original)
+++ team/kmoore/stasis-device_state/res/res_xmpp.c Wed Mar 13 14:58:05 2013
@@ -1360,10 +1360,10 @@
 
 	dev_state = stasis_message_data(msg);
 	if (!dev_state->eid || ast_eid_cmp(&ast_eid_default, dev_state->eid)) {
- 		/* If the event is aggregate or didn't originate from this server, don't send it out. */
- 		return;
- 	}
- 
+		/* If the event is aggregate or didn't originate from this server, don't send it out. */
+		return;
+	}
+
 	xmpp_pubsub_publish_device_state(client, dev_state->device, ast_devstate2str(dev_state->state), dev_state->cachable);
 }