-fixing cmp issue, handling default cases that should be dead, making compiler happier

2 files changed, 24 insertions, 2 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_contacts.c b/src/conversation/gnunet-conversation-gtk_contacts.c
index a84bce5d..3662c67b 100644
--- a/src/conversation/gnunet-conversation-gtk_contacts.c
+++ b/src/conversation/gnunet-conversation-gtk_contacts.c
@@ -199,6 +199,7 @@ display_record (void *cls,
       break;
     default:
       /* ignore, not useful for conversation */
+      type = NULL; /* make compiler happy */
       break;
     }
     if (do_display)
@@ -209,6 +210,11 @@ display_record (void *cls,
       is_public = (0 == (rd[i].flags & GNUNET_GNSRECORD_RF_PRIVATE));
       break;
     }
+    else
+    {
+      /* make compiler happy */
+      is_public = FALSE;
+    }
   }
 
   /* check if exists, if so, update or remove */
diff --git a/src/peerinfo/gnunet-peerinfo-gtk.c b/src/peerinfo/gnunet-peerinfo-gtk.c
index 68327133..4d0e1c81 100644
--- a/src/peerinfo/gnunet-peerinfo-gtk.c
+++ b/src/peerinfo/gnunet-peerinfo-gtk.c
@@ -1026,6 +1026,10 @@ transport_peer_cb (void *cts,
   case GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED:
     led = NULL;
     break;
+  default:
+    GNUNET_break (0);
+    led = NULL;
+    break;
   }
   info = get_peer_info (peer);
   info->state = state;
@@ -1090,7 +1094,6 @@ transport_plugin_cb (void *cls,
 {
   struct PeerInfo *info;
   GtkTreeIter iter;
-  gboolean con;
   const char *tos;
   struct PeerAddress *pa;
   GdkPixbuf *led;
@@ -1123,6 +1126,10 @@ transport_plugin_cb (void *cls,
   case GNUNET_TRANSPORT_SS_DONE:
     led = NULL;
     break;
+  default:
+    GNUNET_break (0);
+    led = NULL;
+    break;
   }
   if (NULL == sinfo->address)
   {
@@ -1136,7 +1143,7 @@ transport_plugin_cb (void *cls,
   pa = get_address (info, sinfo->address);
   get_iter_from_rr (pa->rr, &iter);
   gtk_tree_store_set (ts, &iter,
-                      PEERINFO_MC_PLUGIN_CONNECTIVITY_STATUS, (led_green == tos),
+                      PEERINFO_MC_PLUGIN_CONNECTIVITY_STATUS, (led_green == led),
                       PEERINFO_MC_PLUGIN_CONNECTIVITY_LED, led,
                       PEERINFO_MC_PLUGIN_CONNECTIVITY_TIMEOUT_AS_STRING, tos,
                       -1);
@@ -1227,6 +1234,10 @@ validation_monitor_cb (void *cts,
   case GNUNET_TRANSPORT_VS_REMOVE:
     led = NULL;
     break;
+  default:
+    GNUNET_break (0);
+    led = NULL;
+    break;
   }
   info = get_peer_info (peer);
   if (NULL == address)
@@ -1334,6 +1345,11 @@ handle_core_monitor_event (void *cts,
                                            &reset_core_status,
                                            NULL);
     return;
+  default:
+    GNUNET_break (0);
+    led = NULL;
+    status = -1;
+    break;
   }
   info = get_peer_info (peer);
   get_iter_from_rr (info->rr, &iter);