PsppireSpreadSheetModel: Remove useless check and substitute a useful one.
authorJohn Darrington <john@darrington.wattle.id.au>
Sun, 14 Oct 2018 18:43:18 +0000 (20:43 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sun, 14 Oct 2018 18:43:18 +0000 (20:43 +0200)
Found by cppcheck.

src/ui/gui/psppire-spreadsheet-model.c

index d426b556616d143870eb6f0ce096894425b1d3f8..83a82d44fdd772cdf40ab3112288b8a6ae247263 100644 (file)
@@ -229,13 +229,10 @@ tree_model_get_iter (GtkTreeModel * model, GtkTreeIter * iter,
 static gboolean
 tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter)
 {
-  PsppireSpreadsheetModel *spreadsheetModel =
-    PSPPIRE_SPREADSHEET_MODEL (model);
+  PsppireSpreadsheetModel *spreadsheetModel = PSPPIRE_SPREADSHEET_MODEL (model);
+  g_assert (iter);
   g_return_val_if_fail (iter->stamp == spreadsheetModel->stamp, FALSE);
 
-  if (iter == NULL)
-    return FALSE;
-
   if ((intptr_t) iter->user_data >= spreadsheetModel->spreadsheet->n_sheets - 1)
     {
       iter->user_data = NULL;