[Pkg-telepathy-commits] [telepathy-mission-control-6] 53/90: McdHandlerMap: add some assertions for clarity

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.

commit bf0733380613f6f128562eba3dcc91dfdc6f26db
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Mar 27 08:43:30 2014 +0000

    McdHandlerMap: add some assertions for clarity
---
 src/mcd-handler-map.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/mcd-handler-map.c b/src/mcd-handler-map.c
index af4b9bd..2487d10 100644
--- a/src/mcd-handler-map.c
+++ b/src/mcd-handler-map.c
@@ -205,6 +205,9 @@ _mcd_handler_map_get_handler (McdHandlerMap *self,
                               const gchar *channel_path,
                               const gchar **well_known_name)
 {
+    g_return_val_if_fail (MCD_IS_HANDLER_MAP (self), NULL);
+    g_return_val_if_fail (channel_path != NULL, NULL);
+
     if (well_known_name != NULL)
         *well_known_name = g_hash_table_lookup (self->priv->channel_clients,
                                                 channel_path);
@@ -232,6 +235,10 @@ _mcd_handler_map_set_path_handled (McdHandlerMap *self,
     const gchar *old;
     HandlerProcess *hp;
 
+    g_return_if_fail (MCD_IS_HANDLER_MAP (self));
+    g_return_if_fail (channel_path != NULL);
+    g_return_if_fail (unique_name != NULL);
+
     /* In case we want to re-invoke the same client later, remember its
      * well-known name, if we know it. (In edge cases where we're recovering
      * from an MC crash, we can only guess, so we get NULL.) */
@@ -295,6 +302,9 @@ handled_channel_invalidated_cb (TpChannel *channel,
     const gchar *path = tp_proxy_get_object_path (channel);
     gchar *handler;
 
+    g_return_if_fail (MCD_IS_HANDLER_MAP (self));
+    g_return_if_fail (TP_IS_CHANNEL (channel));
+
     g_signal_handlers_disconnect_by_func (channel,
                                           handled_channel_invalidated_cb,
                                           user_data);
@@ -345,6 +355,10 @@ _mcd_handler_map_set_channel_handled (McdHandlerMap *self,
 {
     const gchar *path = tp_proxy_get_object_path (channel);
 
+    g_return_if_fail (MCD_IS_HANDLER_MAP (self));
+    g_return_if_fail (TP_IS_CHANNEL (channel));
+    g_return_if_fail (unique_name != NULL);
+
     g_hash_table_insert (self->priv->handled_channels,
                          g_strdup (path),
                          g_object_ref (channel));
@@ -367,6 +381,9 @@ _mcd_handler_map_set_handler_crashed (McdHandlerMap *self,
 {
     HandlerProcess *hp;
 
+    g_return_if_fail (MCD_IS_HANDLER_MAP (self));
+    g_return_if_fail (unique_name != NULL);
+
     hp = g_hash_table_lookup (self->priv->handler_processes, unique_name);
 
     if (hp != NULL)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git