Fix some issues revealed by coverity

gtk/conf.c

@@ -134,11 +134,9 @@ gtr_pref_get_all (void)
 int64_t
 gtr_pref_int_get (const tr_quark key)
 {
-  int64_t i = 0;
+  int64_t i;
 
-  tr_variantDictFindInt (getPrefs (), key, &i);
-
-  return i;
+  return tr_variantDictFindInt (getPrefs (), key, &i) ? i : 0;
 }
 
 void
@@ -150,11 +148,9 @@ gtr_pref_int_set (const tr_quark key, int64_t value)
 double
 gtr_pref_double_get (const tr_quark key)
 {
-  double d = 0.0;
+  double d;
 
-  tr_variantDictFindReal (getPrefs (), key, &d);
-
-  return d;
+  return tr_variantDictFindReal (getPrefs (), key, &d) ? d : 0.0;
 }
 
 void
@@ -172,10 +168,7 @@ gtr_pref_flag_get (const tr_quark key)
 {
   bool boolVal;
 
-  if (!tr_variantDictFindBool (getPrefs (), key, &boolVal))
-    boolVal = false;
-
-  return boolVal != 0;
+  return tr_variantDictFindBool (getPrefs (), key, &boolVal) ? boolVal : false;
 }
 
 void
@@ -191,11 +184,9 @@ gtr_pref_flag_set (const tr_quark key, gboolean value)
 const char*
 gtr_pref_string_get (const tr_quark key)
 {
-  const char * str = NULL;
+  const char * str;
 
-  tr_variantDictFindStr (getPrefs (), key, &str, NULL);
-
-  return str;
+  return tr_variantDictFindStr (getPrefs (), key, &str, NULL) ? str : NULL;
 }
 
 void

gtk/filter.c

@@ -182,8 +182,8 @@ tracker_filter_model_update (gpointer gstore)
   qsort (hosts->pdata, hosts->len, sizeof (char*), pstrcmp);
 
   /* update the "all" count */
-  gtk_tree_model_iter_children (model, &iter, NULL);
-  tracker_model_update_count (store, &iter, all);
+  if (gtk_tree_model_iter_children (model, &iter, NULL))
+    tracker_model_update_count (store, &iter, all);
 
   store_pos = first_tracker_pos;
   for (i=0, n=hosts->len ; ;)

gtk/tr-core.c

@@ -1801,10 +1801,11 @@ static void
 on_port_test_response (TrCore * core, tr_variant * response, gpointer u UNUSED)
 {
   tr_variant * args;
-  bool is_open = FALSE;
+  bool is_open;
 
-  if (tr_variantDictFindDict (response, TR_KEY_arguments, &args))
-    tr_variantDictFindBool (args, TR_KEY_port_is_open, &is_open);
+  if (!tr_variantDictFindDict (response, TR_KEY_arguments, &args) ||
+      !tr_variantDictFindBool (args, TR_KEY_port_is_open, &is_open))
+    is_open = false;
 
   core_emit_port_tested (core, is_open);
 }
@@ -1826,10 +1827,11 @@ static void
 on_blocklist_response (TrCore * core, tr_variant * response, gpointer data UNUSED)
 {
   tr_variant * args;
-  int64_t ruleCount = -1;
+  int64_t ruleCount;
 
-  if (tr_variantDictFindDict (response, TR_KEY_arguments, &args))
-    tr_variantDictFindInt (args, TR_KEY_blocklist_size, &ruleCount);
+  if (!tr_variantDictFindDict (response, TR_KEY_arguments, &args) ||
+      !tr_variantDictFindInt (args, TR_KEY_blocklist_size, &ruleCount))
+    ruleCount = -1;
 
   if (ruleCount > 0)
     gtr_pref_int_set (TR_KEY_blocklist_date, tr_time ());

gtk/util.c

@@ -347,10 +347,8 @@ gtr_get_help_uri (void)
 
   if (!uri)
     {
-      int major, minor;
       const char * fmt = "http://www.transmissionbt.com/help/gtk/%d.%dx";
-      sscanf (SHORT_VERSION_STRING, "%d.%d", &major, &minor);
-      uri = g_strdup_printf (fmt, major, minor / 10);
+      uri = g_strdup_printf (fmt, MAJOR_VERSION, MINOR_VERSION / 10);
     }
 
   return uri;