[gnome-network-displays/cc-tmp: 78/80] g_assert_not_reached for switch cases




commit 976c76b0c5067a2f18f581d6cd2e50a95d850ef0
Author: Anupam Kumar <kyteinsky gmail com>
Date:   Wed Sep 7 20:29:28 2022 +0530

    g_assert_not_reached for switch cases

 src/cc/cc-comm.c        | 44 +++++++++++++++++---------------------------
 src/cc/cc-ctrl.c        |  3 +--
 src/cc/cc-json-helper.c |  4 ++--
 3 files changed, 20 insertions(+), 31 deletions(-)
---
diff --git a/src/cc/cc-comm.c b/src/cc/cc-comm.c
index e7f0eea..a5b137c 100644
--- a/src/cc/cc-comm.c
+++ b/src/cc/cc-comm.c
@@ -358,7 +358,7 @@ cc_comm_tls_send (CcComm  * comm,
   return TRUE;
 }
 
-static gboolean
+static void
 cc_comm_build_message (Cast__Channel__CastMessage             *message,
                        gchar                                  *sender_id,
                        gchar                                  *destination_id,
@@ -402,7 +402,7 @@ cc_comm_build_message (Cast__Channel__CastMessage             *message,
       break;
 
     default:
-      return FALSE;
+      g_assert_not_reached ();
     }
 
   message->payload_type = payload_type;
@@ -419,10 +419,8 @@ cc_comm_build_message (Cast__Channel__CastMessage             *message,
       break;
 
     default:
-      return FALSE;
+      g_assert_not_reached ();
     }
-
-  return TRUE;
 }
 
 gboolean
@@ -444,31 +442,23 @@ cc_comm_send_request (CcComm       *comm,
       binary_payload.data = NULL;
       binary_payload.len = 0;
 
-      if (!cc_comm_build_message (&message,
-                                  CC_DEFAULT_SENDER_ID,
-                                  destination_id,
-                                  message_type,
-                                  CAST__CHANNEL__CAST_MESSAGE__PAYLOAD_TYPE__BINARY,
-                                  &binary_payload,
-                                  NULL))
-        {
-          g_warning ("Auth message building failed!");
-          return FALSE;
-        }
+      cc_comm_build_message (&message,
+                             CC_DEFAULT_SENDER_ID,
+                             destination_id,
+                             message_type,
+                             CAST__CHANNEL__CAST_MESSAGE__PAYLOAD_TYPE__BINARY,
+                             &binary_payload,
+                             NULL);
       break;
 
     default:
-      if (!cc_comm_build_message (&message,
-                                  CC_DEFAULT_SENDER_ID,
-                                  destination_id,
-                                  message_type,
-                                  CAST__CHANNEL__CAST_MESSAGE__PAYLOAD_TYPE__STRING,
-                                  NULL,
-                                  utf8_payload))
-        {
-          g_warning ("Message building failed for message type: %d", message_type);
-          return FALSE;
-        }
+      cc_comm_build_message (&message,
+                             CC_DEFAULT_SENDER_ID,
+                             destination_id,
+                             message_type,
+                             CAST__CHANNEL__CAST_MESSAGE__PAYLOAD_TYPE__STRING,
+                             NULL,
+                             utf8_payload);
     }
 
   packed_size = cast__channel__cast_message__get_packed_size (&message);
diff --git a/src/cc/cc-ctrl.c b/src/cc/cc-ctrl.c
index 4b39c3b..c205929 100644
--- a/src/cc/cc-ctrl.c
+++ b/src/cc/cc-ctrl.c
@@ -577,8 +577,7 @@ cc_ctrl_handle_received_msg (gpointer                    userdata,
 
     case CC_RWAIT_TYPE_UNKNOWN:
     default:
-      g_warning ("CcCtrl: Unknown message type");
-      cc_ctrl_close_connection (ctrl);
+      g_debug ("CcCtrl: Unknown message type");
       break;
     }
 }
diff --git a/src/cc/cc-json-helper.c b/src/cc/cc-json-helper.c
index 8025ca6..2839b06 100644
--- a/src/cc/cc-json-helper.c
+++ b/src/cc/cc-json-helper.c
@@ -60,7 +60,7 @@ cc_json_helper_build_internal (JsonBuilder *builder,
           continue;
 
         default:
-          return;
+          g_assert_not_reached ();
         }
 
       json_builder_begin_array (builder);
@@ -95,7 +95,7 @@ cc_json_helper_build_internal (JsonBuilder *builder,
               break;
 
             default:
-              return;
+              g_assert_not_reached ();
             }
         }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]