More runtime warnings fixed

diff --git a/lib/gtksheet/psppire-axis-impl.c b/lib/gtksheet/psppire-axis-impl.c
index 1fb00d2d8435df76be0b9b1e3d8c4b5fdbfc8147..38ade632366633714d579be5ad9718a46278a15b 100644 (file)
--- a/lib/gtksheet/psppire-axis-impl.c
+++ b/lib/gtksheet/psppire-axis-impl.c
@@ -264,7 +264,8 @@ psppire_axis_impl_append_n (PsppireAxisImpl *a, gint n_units, gint size)
 {
   struct axis_node *node;
 
-  g_return_if_fail (n_units > 0);
+  if  (n_units == 0)
+    return;
 
   node = pool_malloc (a->pool, sizeof *node);
 
@@ -438,7 +439,7 @@ psppire_axis_impl_delete (PsppireAxisImpl *a, gint first, gint n_units)
   gint units_to_delete = n_units;
   unsigned long int start;
   struct tower_node *unit_node ;
-  g_return_if_fail (first + n_units < tower_height (&a->unit_tower));
+  g_return_if_fail (first + n_units <= tower_height (&a->unit_tower));
 
   split (a, first);
   split (a, first + n_units);

diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c
index 2059d75ad716e42439a616f671f9b3701d155960..e0402dea9ba02cc24fba1b814f5fc83cfd81539f 100644 (file)
--- a/src/ui/gui/psppire-data-store.c
+++ b/src/ui/gui/psppire-data-store.c
@@ -662,7 +662,8 @@ psppire_data_store_set_string (PsppireDataStore *store,
 {
   glong n_cases;
   const struct variable *pv = psppire_dict_get_variable (store->dict, col);
-  g_return_val_if_fail (pv, FALSE);
+  if ( NULL == pv)
+    return FALSE;
 
   n_cases = psppire_data_store_get_case_count (store);